waistband 0.4.2 → 0.7.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waistband
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,9 +109,7 @@ files:
 - lib/waistband.rb
 - lib/waistband/configuration.rb
 - lib/waistband/connection.rb
-- lib/waistband/free_query.rb
 - lib/waistband/index.rb
-- lib/waistband/model.rb
 - lib/waistband/query.rb
 - lib/waistband/query_helpers.rb
 - lib/waistband/query_result.rb
@@ -125,9 +123,7 @@ files:
 - spec/config/waistband/waistband_search.yml
 - spec/lib/configuration_spec.rb
 - spec/lib/connection_spec.rb
-- spec/lib/free_query_spec.rb
 - spec/lib/index_spec.rb
-- spec/lib/model_spec.rb
 - spec/lib/query_result_spec.rb
 - spec/lib/query_spec.rb
 - spec/lib/stringified_array_spec.rb
@@ -167,9 +163,7 @@ test_files:
 - spec/config/waistband/waistband_search.yml
 - spec/lib/configuration_spec.rb
 - spec/lib/connection_spec.rb
-- spec/lib/free_query_spec.rb
 - spec/lib/index_spec.rb
-- spec/lib/model_spec.rb
 - spec/lib/query_result_spec.rb
 - spec/lib/query_spec.rb
 - spec/lib/stringified_array_spec.rb

data/lib/waistband/free_query.rb

@@ -1,34 +0,0 @@
-require 'active_support/core_ext/hash/indifferent_access'
-
-module Waistband
-  class FreeQuery
-
-    include ::Waistband::QueryHelpers
-
-    attr_accessor :page, :page_size
-
-    def initialize(index, options = {})
-      @index      = index
-      @page       = (options[:page] || 1).to_i
-      @page_size  = (options[:page_size] || 20).to_i
-    end
-
-    def prepare(hash)
-      @hash = hash.with_indifferent_access
-    end
-
-    private
-
-      def to_hash
-        raise "No query has been prepared yet!" unless @hash
-
-        @hash[:from] = from       unless @hash[:from]
-        @hash[:size] = @page_size unless @hash[:size]
-
-        @hash
-      end
-
-    # /private
-
-  end
-end

data/lib/waistband/model.rb

@@ -1,215 +0,0 @@
-require 'digest/sha1'
-require 'json'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/values/time_zone'
-require 'active_support/time_with_zone'
-
-module Waistband
-  class Model
-
-    class_attribute :index_name, :column_names, :validate_columns,
-                    :default_values, :stringify_columns
-
-    class << self
-
-      def index
-        @index ||= Waistband::Index.new(index_name)
-      end
-
-      def find(id)
-        attrs = index.read(id)
-        raise ActiveRecord::RecordNotFound.new("#{self} not found!") unless attrs
-        new attrs
-      end
-
-      def create(attributes)
-        instance = new(attributes)
-        instance.save
-        instance
-      end
-
-      def query
-        q = index.query('')
-        q.add_term('model_type', name.underscore)
-        q
-      end
-
-      def query_desc
-        q = query
-        q.add_sort 'created_at', 'desc'
-        q
-      end
-
-      def query_asc
-        q = query
-        q.add_sort 'created_at', 'asc'
-        q
-      end
-
-      def first
-        attrs = query_asc.results.first.try(:source)
-        return new(attrs) if attrs
-        nil
-      end
-
-      def last
-        attrs = query_desc.results.first.try(:source)
-        return new(attrs) if attrs
-        nil
-      end
-
-      def with_index(name)
-        self.index_name = name.to_s
-      end
-
-      def create_index!
-        Waistband::Index.new(index_name).create!
-      end
-
-      def destroy_index!
-        Waistband::Index.new(index_name).destroy!
-      end
-
-      def validates(*cols)
-        self.validate_columns ||= []
-        self.validate_columns |= cols.map(&:to_sym)
-      end
-
-      def defaults(values = {})
-        self.default_values ||= {}
-
-        values.each do |k, v|
-          self.default_values = self.default_values.merge({k.to_sym => v})
-        end
-      end
-
-      def stringify(*cols)
-        self.stringify_columns ||= []
-        self.stringify_columns |= cols.map(&:to_sym)
-      end
-
-      def columns(*cols)
-        cols               |= [:id, :model_type, :created_at, :updated_at]
-        self.column_names ||= []
-        self.column_names  |= cols.map(&:to_sym)
-
-        cols.each do |col|
-          # Normal attributes setters and getters
-          class_eval <<-EV, __FILE__, __LINE__ + 1
-            def #{col}
-              read_attribute(:#{col})
-            end
-
-            def #{col}=(val)
-              write_attribute(:#{col}, val)
-            end
-          EV
-
-          # Relationship type columns: `user_id`, `app_id` to `user`, `app`
-          if col =~ /(.*)_id$/
-            class_eval <<-EV, __FILE__, __LINE__ + 1
-              def #{$1}
-                klass = "#{$1}".classify.constantize
-                klass.find(#{col})
-              end
-
-              def #{$1}=(val)
-                write_attribute(:#{$1}_id, val.id)
-              end
-            EV
-          end
-
-        end
-      end
-
-    end # /class << self
-
-    attr_reader :errors
-
-    def initialize(attributes = {})
-      @attributes = (attributes || {}).symbolize_keys
-
-      @attributes.each do |key, val|
-        if self.class.stringify_columns.include?(key)
-          self.send("#{key}=", val)
-        elsif !self.class.column_names.include?(key)
-          raise ArgumentError.new("#{key} is not a valid column name!")
-        end  
-      end
-
-      self.class.default_values.each do |k, v|
-        self.send("#{k}=", v) if self.send(k).nil?
-      end
-
-      @errors = ::Waistband::QuickError.new
-    end
-
-    def save
-      return false unless valid?
-
-      before_save
-
-      prev_id         = self.id
-      prev_created_at = self.created_at
-      prev_updated_at = self.updated_at
-
-      self.id         ||= generated_id
-      self.created_at ||= (Time.zone || Time).now.to_i
-      self.updated_at   = (Time.zone || Time).now.to_i
-      self.model_type   = self.class.name.downcase
-
-      stored_json = JSON.parse store!
-      stored      = !!stored_json.try(:[], 'ok')
-
-      if stored
-        after_save
-      else stored
-        self.id         = prev_id
-        self.created_at = prev_created_at
-        self.updated_at = prev_updated_at
-      end
-
-      stored
-    end
-
-    def before_save
-    end
-
-    def after_save
-    end
-
-    def valid?
-      self.class.validate_columns.each do |col|
-        @errors << "#{col} cannot be nil" if self.send(col).nil?
-      end
-
-      @errors.empty?
-    end
-
-    def attributes
-      Hash[self.class.column_names.map{|col| [col, self.send(col)] }]
-    end
-
-    def read_attribute(attribute)
-      @attributes[attribute]
-    end
-
-    def write_attribute(attribute, val)
-      val = val.to_s if self.class.stringify_columns.include?(attribute.to_sym)
-      @attributes[attribute] = val
-    end
-
-    private
-
-      def store!
-        self.class.index.store!(id, attributes)
-      end
-
-      def generated_id
-        @generated_id ||= Digest::SHA1.hexdigest "#{attributes}:#{rand(999999)}"
-      end
-
-    # /private
-
-  end
-end

data/spec/lib/free_query_spec.rb

@@ -1,161 +0,0 @@
-require 'spec_helper'
-
-describe Waistband::FreeQuery do
-
-  let(:index)     { Waistband::Index.new('search') }
-  let(:geo_index) { Waistband::Index.new('geo') }
-
-  let(:query)     { Waistband::FreeQuery.new('search') }
-  let(:geo_query) { Waistband::FreeQuery.new('geo') }
-
-  let(:attrs) do
-    {
-      'query' => {
-        'bool' => {
-          'must' => [
-            {
-              'multi_match' => {
-                'query' => "shopping ikea",
-                'fields' => ['name']
-              },
-            }
-          ]
-        }
-      }
-    }
-  end
-
-  it "correclty forms a query hash" do
-    add_result!
-    query.prepare(attrs)
-
-    expect(query.instance_variable_get('@hash')).to eql(attrs)
-  end
-
-  it "finds results for a free query" do
-    add_result!
-    query.prepare(attrs)
-    json = query.send(:execute!)
-
-    json['hits'].should be_a Hash
-    json['hits']['total'].should > 0
-    json['hits']['hits'].size.should eql 2
-
-    hit = json['hits']['hits'].first
-
-    hit['_id'].should match(/^task_.*/)
-    hit['_source'].should be_a Hash
-    hit['_source']['id'].should eql 123123
-    hit['_source']['name'].should eql 'some shopping in ikea'
-    hit['_source']['user_id'].should eql 999
-    hit['_source']['description'].should eql 'i need you to pick up some stuff in ikea'
-  end
-
-  it "permits storing and fetching geo results" do
-    add_geo_results!
-    geo_query.prepare({
-      "query" => {
-        "filtered" => {
-          "query" => { "match_all" => {} },
-          "filter" => {
-             "geo_shape" => {
-               "work_area" => {
-                 "relation" => "intersects",
-                 "shape" => {
-                   "type" => "Point",
-                   "coordinates" => [-122.39455,37.7841]
-                 }
-               }
-             }
-          }
-        }
-      }
-    })
-
-    json = geo_query.send(:execute!)
-
-    json['hits'].should be_a Hash
-    json['hits']['total'].should eql 3
-    json['hits']['hits'].size.should eql 3
-
-    geo_query.prepare({
-      "query" => {
-        "filtered" => {
-          "query" => { "match_all" => {} },
-          "filter" => {
-             "geo_shape" => {
-               "work_area" => {
-                 "relation" => "intersects",
-                 "shape" => {
-                   "type" => "Point",
-                   "coordinates" => [-122.3859222222222,37.78292222222222]
-                 }
-               }
-             }
-          }
-        }
-      }
-    })
-
-    json = geo_query.send(:execute!)
-
-    json['hits'].should be_a Hash
-    json['hits']['total'].should eql 1
-    json['hits']['hits'].size.should eql 1
-  end
-
-  def add_result!
-    index.store!("task_123123", {id: 123123, name: 'some shopping in ikea',                   user_id: 999, description: 'i need you to pick up some stuff in ikea',  internal: false})
-    index.store!("task_234234", {id: 234234, name: "some shopping in ikea and trader joe's",  user_id: 987, description: 'pick me up some eggs',                      internal: true})
-    index.refresh
-  end
-
-  def add_geo_results!
-    geo_index.store!("rabbit_1", {
-      id: "rabbit_1",
-      work_area: {
-        type: 'polygon',
-        coordinates: [[
-          [-122.4119,37.78211],
-          [-122.39285,37.79649],
-          [-122.37997,37.78415],
-          [-122.39817,37.77248],
-          [-122.40932,37.77302],
-          [-122.4119,37.78211]
-        ]]
-      }
-    })
-
-    geo_index.store!("rabbit_2", {
-      id: "rabbit_2",
-      work_area: {
-        type: 'polygon',
-        coordinates: [[
-          [-122.41087,37.78822],
-          [-122.43174,37.78578],
-          [-122.42816,37.75938],
-          [-122.38787,37.76882],
-          [-122.39199,37.78584],
-          [-122.41087,37.78822]
-        ]]
-      }
-    })
-
-    geo_index.store!("rabbit_3", {
-      id: "rabbit_3",
-      work_area: {
-        type: 'polygon',
-        coordinates: [[
-          [-122.41997,37.79744],
-          [-122.39576,37.79975],
-          [-122.38461,37.78469],
-          [-122.40294,37.77738],
-          [-122.41997,37.79744]
-        ]]
-      }
-    })
-
-    geo_index.refresh
-  end
-
-end