gummi 0.0.6 → 0.0.7

data/bin/console

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+require 'bundler/setup'
+Bundler.require
+
+$: << ::File.expand_path('../..', __FILE__)
+
+require 'pry'
+require 'lib/gummi'
+require 'spec/models/db/person'
+require 'spec/models/person'
+require 'spec/models/people'
+RAILS_ENV = ENV['RAILS_ENV'] || 'development'
+
+def reload!
+  puts "reloading..."
+  Pry.save_history
+  exec('bin/console')
+end
+
+Pry.config.prompt = [ proc { "gummi >> " }, proc { "... >> " }]
+Pry.start

data/gummi.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency('leaflet')
 
   spec.add_development_dependency('bundler', '~> 1.3')
+  spec.add_development_dependency('pry')
+
   spec.add_development_dependency('rake')
   spec.add_development_dependency('rspec')
 end

data/lib/gummi/document/attributes.rb

@@ -0,0 +1,28 @@
+module Gummi
+  module Document
+    module Attributes
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+
+        def mapping_for_attribute(attribute)
+          if attribute.is_a? Virtus::Attribute::EmbeddedValue
+            {properties: attribute.primitive.mapping}
+          elsif attribute.is_a? Virtus::Attribute::Collection
+            mapping_for_attribute(attribute.member_type)
+          else
+            attribute.mapping
+          end
+        end
+
+        def mapping
+          result = {}
+          attribute_set.each do |attribute|
+            result.merge!({ attribute.name => mapping_for_attribute(attribute)})
+          end
+          result
+        end
+      end
+    end
+  end
+end

data/lib/gummi/document/search/filtered.rb

@@ -0,0 +1,39 @@
+module Gummi
+  module Document
+    module Search
+      class Filtered
+        include Gummi::Document::Search::Searching
+
+        attribute :query_string,  Gummi::Fields::SanitizedString
+        attribute :terms,         Array[Hash],                    default: []
+        attribute :query_filters, Array[Hash],                    default: []
+        attribute :facets,        Hash,                           default: {}
+
+        def to_client_args
+          args = {}
+          args[:index] = index
+          args[:type]  = type if type
+          args[:from]  = from
+          args[:body]  = {query: filtered, facets: facets }
+          args
+        end
+
+        def query
+          {query_string: { query: query_string}} if query_string.present?
+        end
+
+        def filtered
+          { 'filtered' => { 'query' => query, 'filter' => process_query_filters }}
+        end
+
+        def process_query_filters
+          if query_filters.length > 1
+            {and: query_filters}
+          else
+            query_filters.first
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gummi/document/search/raw.rb

@@ -0,0 +1,9 @@
+module Gummi
+  module Document
+    module Search
+      class Raw
+        include Gummi::Document::Search::Searching
+      end
+    end
+  end
+end

data/lib/gummi/document/search/result.rb

@@ -0,0 +1,25 @@
+module Gummi
+  module Document
+    module Search
+      class Result
+
+        attr_reader :took, :total, :hits, :facets
+
+        def initialize(result)
+          @took = result["took"]
+          @total = result["hits"]["total"]
+          @hits = result["hits"]["hits"]
+          @facets = result["facets"]
+        end
+
+        def records
+          hits.map do |hit|
+            model = "DB::#{hit["_type"].humanize}".constantize
+            doc_hash = {id: hit["_id"]}.merge(hit["_source"])
+            model.new(doc_hash)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gummi/document/search/searching.rb

@@ -0,0 +1,45 @@
+module Gummi
+  module Document
+    module Search
+      module Searching
+        extend ActiveSupport::Concern
+
+        included do
+          include Virtus.model
+
+          attribute :type,          String
+          attribute :index,         String,                         default: lambda {|search, attr| Gummi::DefaultIndex.name}
+          attribute :page,          Gummi::Fields::PositiveInteger, default: 1
+          attribute :per_page,      Gummi::Fields::PositiveInteger, default: 300
+          attribute :options,       Hash,                           default: {}
+        end
+
+        def size
+          per_page
+        end
+
+        def from
+          per_page * (page - 1)
+        end
+
+        def execute
+          Gummi::Document::Search::Result.new client.search(to_client_args)
+        end
+
+        def to_client_args
+          args = {}
+          args[:index] = index
+          args[:type]  = type if type
+          args[:from]  = from
+          args[:size]  = size
+          args.merge options
+        end
+
+        private
+        def client
+          Gummi::API.client
+        end
+      end
+    end
+  end
+end

data/lib/gummi/document.rb

@@ -4,7 +4,7 @@ module Gummi
 
     included do
       include Virtus.model
-      include Gummi::Attributes
+      include Gummi::Document::Attributes
     end
 
     attr_accessor :id
@@ -21,6 +21,17 @@ module Gummi
       end
     end
 
+    def create
+      response = client.create index: index.name, type: document_type, id: id, body: attributes
+      if response["ok"]
+        self.version = response["_version"]
+        self.id = response["_id"]
+        true
+      else
+        false
+      end
+    end
+
     def update
       response = client.update index: index.name, type: document_type, id: id, retry_on_conflict: 0, version: version, body: { doc: attributes.as_json }
       if response["ok"]
@@ -47,6 +58,16 @@ module Gummi
 
     module ClassMethods
 
+      def create(attributes)
+        document = self.new(attributes)
+        response = client.create index: index.name, type: document_type, id: document.id, body: document.attributes
+        if response["ok"]
+          document.version = response["_version"]
+          document.id = response["_id"]
+          document
+        end
+      end
+
       def get!(id)
         response = client.get index: index.name, type: document_type, id: id
         doc_hash = {id: response["_id"], version: response["_version"]}.merge(response["_source"])
@@ -91,7 +112,7 @@ module Gummi
         args[:type]  = document_type
         args.merge! options
 
-        Gummi::Search::Filtered.new args
+        Gummi::Document::Search::Filtered.new args
       end
 
       def creation_options

data/lib/gummi/repository/result.rb

@@ -0,0 +1,24 @@
+module Gummi
+  module Repository
+    class Result
+
+      attr_reader :took, :total, :hits, :facets
+
+      def initialize(db_result, repository, per_page, page)
+        @took = db_result.took
+        @total = db_result.total
+        @hits = db_result.hits
+        @facets = db_result.facets
+        @db_records = db_result.records
+        @repository = repository
+        @per_page = per_page
+        @page = page
+      end
+
+      def records
+        entities = Array(@repository.to_entity_from_db(@db_records)) if @db_records
+        Leaflet::Collection.new entities, {per_page: @per_page, current_page: @page, total_entries: total}
+      end
+    end
+  end
+end

data/lib/gummi/repository.rb

@@ -16,6 +16,13 @@ module Gummi
         to_entity_from_db record if record
       end
 
+      def search(&block)
+        filtered_search = db_model.new_filtered_search
+        yield filtered_search
+        result = filtered_search.execute
+        Repository::Result.new(result, self, filtered_search.per_page, filtered_search.page)
+      end
+
       def overwrite(entity)
         return false unless entity.valid?
         db_record = db_model.new(entity.attributes)

data/lib/gummi/version.rb

@@ -1,3 +1,3 @@
 module Gummi
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/gummi.rb

@@ -10,12 +10,13 @@ require "repobahn/entity"
 
 require "gummi/version"
 require "gummi/api"
-require "gummi/attributes"
+require "gummi/document/attributes"
 require "gummi/document"
 require "gummi/entity"
 require "gummi/index"
 require "gummi/object"
 require "gummi/repository"
+require "gummi/repository/result"
 require "gummi/fields/boolean"
 require "gummi/fields/time"
 require "gummi/fields/integer"
@@ -26,10 +27,10 @@ require "gummi/fields/path_hierarchy"
 require "gummi/fields/string"
 require "gummi/fields/sanitized_string"
 require "gummi/default_index"
-require "gummi/search/searching"
-require "gummi/search/filtered"
-require "gummi/search/raw"
-require "gummi/search/result"
+require "gummi/document/search/searching"
+require "gummi/document/search/filtered"
+require "gummi/document/search/raw"
+require "gummi/document/search/result"
 
 module Gummi
   def self.env

data/spec/lib/gummi/document_spec.rb

@@ -63,10 +63,9 @@ describe Gummi::Document do
   end
 
   context 'getting from elastic' do
-    let (:person) { DB::Person.new(name: 'Buzz Lightyear') }
+    let (:person) { DB::Person.create(name: 'Buzz Lightyear') }
 
     it "should return an instance of the db_model" do
-      person.overwrite
       person_from_es = DB::Person.get(person.id)
       person_from_es.should be_a DB::Person
     end

data/spec/lib/gummi/repository_spec.rb

@@ -36,10 +36,9 @@ describe Gummi::Repository do
   describe ".get" do
     context "existing record" do
 
-      let (:db_person) { DB::Person.new(name: 'Buzz Lightyear') }
+      let (:db_person) { DB::Person.create(name: 'Buzz Lightyear') }
 
       it "should return an entity" do
-        db_person.overwrite
         person = People.get(db_person.id)
         person.id.should == db_person.id
       end
@@ -53,5 +52,30 @@ describe Gummi::Repository do
     end
   end
 
+  describe ".search" do
+
+    before(:each) do
+      DB::Person.create(name: 'Buzz Lightyear')
+      DB::Person.create(name: 'Woody')
+      Gummi::DefaultIndex.refresh
+    end
+
+    it "should find the correct documents" do
+      result = People.search do |search|
+        search.query_string = "Woody"
+      end
+      result.total.should == 1
+      result.records.first.name.should == "Woody"
+    end
+
+    it "should convert the result to entities" do
+      result = People.search do |search|
+        search.query_string = "Woody"
+      end
+      woody = result.records.first
+      woody.converted_name.should == 'ydooW'
+      woody.should be_a Person
+    end
+  end
 
 end

data/spec/models/db/person.rb

@@ -4,7 +4,7 @@ module DB
   class Person
     include Gummi::Document
 
-    attribute :name,          Gummi::Fields::String
+    attribute :name,          Gummi::Fields::Keyword
     attribute :computed_name, Gummi::Fields::String
     attribute :born_at,       Gummi::Fields::Time
 

data/spec/models/person.rb

@@ -4,4 +4,8 @@ class Person
 
   attribute :name, String
   attribute :converted_name, String
+
+  def self.hello
+    puts "hej"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gummi
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -123,6 +123,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +173,8 @@ dependencies:
         version: '0'
 description: A small wrapper around Elasticsearch
 email: 
-executables: []
+executables:
+- console
 extensions: []
 extra_rdoc_files: []
 files:
@@ -166,12 +183,17 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
 - gummi.gemspec
 - lib/gummi.rb
 - lib/gummi/api.rb
-- lib/gummi/attributes.rb
 - lib/gummi/default_index.rb
 - lib/gummi/document.rb
+- lib/gummi/document/attributes.rb
+- lib/gummi/document/search/filtered.rb
+- lib/gummi/document/search/raw.rb
+- lib/gummi/document/search/result.rb
+- lib/gummi/document/search/searching.rb
 - lib/gummi/entity.rb
 - lib/gummi/fields/boolean.rb
 - lib/gummi/fields/integer.rb
@@ -185,10 +207,7 @@ files:
 - lib/gummi/index.rb
 - lib/gummi/object.rb
 - lib/gummi/repository.rb
-- lib/gummi/search/filtered.rb
-- lib/gummi/search/raw.rb
-- lib/gummi/search/result.rb
-- lib/gummi/search/searching.rb
+- lib/gummi/repository/result.rb
 - lib/gummi/version.rb
 - lib/repobahn/entity.rb
 - lib/repobahn/repository.rb

data/lib/gummi/attributes.rb

@@ -1,26 +0,0 @@
-module Gummi
-  module Attributes
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-
-      def mapping_for_attribute(attribute)
-        if attribute.is_a? Virtus::Attribute::EmbeddedValue
-          {properties: attribute.primitive.mapping}
-        elsif attribute.is_a? Virtus::Attribute::Collection
-          mapping_for_attribute(attribute.member_type)
-        else
-          attribute.mapping
-        end
-      end
-
-      def mapping
-        result = {}
-        attribute_set.each do |attribute|
-          result.merge!({ attribute.name => mapping_for_attribute(attribute)})
-        end
-        result
-      end
-    end
-  end
-end

data/lib/gummi/search/filtered.rb

@@ -1,36 +0,0 @@
-module Gummi
-  module Search
-    class Filtered
-      include Gummi::Search::Searching
-
-      attribute :query_string,  Gummi::Fields::SanitizedString
-      attribute :query_filters, Array[Hash],                    default: []
-      attribute :facets,        Hash,                           default: {}
-
-      def to_client_args
-        args = {}
-        args[:index] = index
-        args[:type]  = type if type
-        args[:from]  = from
-        args[:body]  = {query: filtered, facets: facets }
-        args
-      end
-
-      def query
-        {query_string: { query: query_string}} if query_string.present?
-      end
-
-      def filtered
-        { 'filtered' => { 'query' => query, 'filter' => process_query_filters }}
-      end
-
-      def process_query_filters
-        if query_filters.length > 1
-          {and: query_filters}
-        else
-          query_filters.first
-        end
-      end
-    end
-  end
-end

data/lib/gummi/search/raw.rb

@@ -1,7 +0,0 @@
-module Gummi
-  module Search
-    class Raw
-      include Gummi::Search::Searching
-    end
-  end
-end

data/lib/gummi/search/result.rb

@@ -1,23 +0,0 @@
-module Gummi
-  module Search
-    class Result
-
-      attr_reader :took, :total, :hits, :facets
-
-      def initialize(result)
-        @took = result["took"]
-        @total = result["hits"]["total"]
-        @hits = result["hits"]["hits"]
-        @facets = result["facets"]
-      end
-
-      def records
-        hits.map do |hit|
-          model = "DB::#{hit["_type"].humanize}".constantize
-          doc_hash = {id: hit["_id"]}.merge(hit["_source"])
-          model.new(doc_hash)
-        end
-      end
-    end
-  end
-end

data/lib/gummi/search/searching.rb

@@ -1,43 +0,0 @@
-module Gummi
-  module Search
-    module Searching
-      extend ActiveSupport::Concern
-
-      included do
-        include Virtus.model
-
-        attribute :type,          String
-        attribute :index,         String,                         default: lambda {|search, attr| Gummi::DefaultIndex.name}
-        attribute :page,          Gummi::Fields::PositiveInteger, default: 1
-        attribute :per_page,      Gummi::Fields::PositiveInteger, default: 300
-        attribute :options,       Hash,                           default: {}
-      end
-
-      def size
-        per_page
-      end
-
-      def from
-        per_page * (page - 1)
-      end
-
-      def execute
-        Gummi::Search::Result.new client.search(to_client_args)
-      end
-
-      def to_client_args
-        args = {}
-        args[:index] = index
-        args[:type]  = type if type
-        args[:from]  = from
-        args[:size]  = size
-        args.merge options
-      end
-
-      private
-      def client
-        Gummi::API.client
-      end
-    end
-  end
-end