gummi 0.2.3 → 0.3.0

data/lib/gummi/repository_layer/repository.rb

@@ -8,36 +8,32 @@ module Gummi
         after_conversion :set_id_and_version
       end
 
-      module ClassMethods
-
-        def get(id)
-          document = db_class.get id
-          db_instance_to_entity document if document
-        end
-
-        def search(options = {}, &block)
-          search = db_class.new_filtered_search(options)
-          yield search if block_given?
-          Repository::Result.new search.execute, self
-        end
+      def get(id)
+        document = db_class.get id
+        db_instance_to_entity document if document
+      end
 
-        def raw_search(options = {}, &block)
-          search = db_class.new_raw_search(options)
-          yield search if block_given?
-          Repository::Result.new search.execute, self
-        end
+      def search(options = {}, &block)
+        search = db_class.new_filtered_search(options)
+        yield search if block_given?
+        Repository::Result.new search.execute, self
+      end
 
-        def overwrite(entity)
-          return false unless entity.valid?
-          document = db_class.new(entity.attributes)
-          document.overwrite
-        end
+      def raw_search(options = {}, &block)
+        search = db_class.new_raw_search(options)
+        yield search if block_given?
+        Repository::Result.new search.execute, self
+      end
 
-        def set_id_and_version(entity, db_instance)
-          entity.id      = db_instance.id
-          entity.version = db_instance.version
-        end
+      def overwrite(entity)
+        return false unless entity.valid?
+        document = db_class.new(entity.attributes)
+        document.overwrite
+      end
 
+      def set_id_and_version(entity, db_instance)
+        entity.id      = db_instance.id
+        entity.version = db_instance.version
       end
 
     end

data/lib/gummi/version.rb

@@ -1,3 +1,3 @@
 module Gummi
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/lib/gummi.rb

@@ -6,7 +6,6 @@ require 'hooks'
 require 'leaflet'
 require 'hashie/mash'
 
-require 'repobahn/repository/active_record'
 require 'repobahn/repository'
 require 'repobahn/entity'
 

data/lib/repobahn/repository.rb

@@ -2,8 +2,6 @@ module Repobahn
   module Repository
     extend ActiveSupport::Concern
 
-    include ::Repobahn::Repository::ActiveRecord
-
     included do
       include Hooks
       define_hook :after_conversion
@@ -21,17 +19,6 @@ module Repobahn
         @entity_class || default_entity_class
       end
 
-      def db_instances_to_entities(db_instances)
-        entities = Array(db_instances).map { |db_instance| db_instance_to_entity(db_instance) }
-        entities.length > 1 ? entities : entities.first
-      end
-
-      def db_instance_to_entity(db_instance)
-        entity = entity_class.new(db_instance.attributes)
-        run_hook :after_conversion, entity, db_instance
-        entity
-      end
-
       private
 
       def default_db_class
@@ -45,5 +32,24 @@ module Repobahn
       end
 
     end
+
+    def db_class
+      self.class.db_class
+    end
+
+    def entity_class
+      self.class.entity_class
+    end
+
+    def db_instances_to_entities(db_instances)
+      entities = Array(db_instances).map { |db_instance| db_instance_to_entity(db_instance) }
+      entities.length > 1 ? entities : entities.first
+    end
+
+    def db_instance_to_entity(db_instance)
+      entity = entity_class.new(db_instance.attributes)
+      run_hook :after_conversion, entity, db_instance
+      entity
+    end
   end
 end

data/spec/lib/gummi/repository_layer/repository_spec.rb

@@ -12,31 +12,35 @@ describe Gummi::RepositoryLayer::Repository do
     it 'is included' do
       repository_class.should respond_to :db_class
       repository_class.should respond_to :entity_class
-      repository_class.should respond_to :db_instance_to_entity
+      repository_class.new.should respond_to :db_instance_to_entity
     end
   end
 
   describe '.get', elastic: true do
+
+    let (:people) { People.new }
+
     context 'existing record' do
       let (:db_person) { DB::Person.create name: 'Buzz Lightyear' }
 
       it 'return an entity' do
-        person = People.get(db_person.id)
+        person = people.get(db_person.id)
         person.id.should == db_person.id
       end
     end
 
     context 'missing record' do
       it 'returns nil' do
-        person = People.get 'missing_id'
+        person = people.get 'missing_id'
         person.should be_nil
       end
     end
   end
 
   describe '.search', elastic: true do
-    let(:buzz)  { DB::Person.create name: 'Buzz Lightyear' }
-    let(:woody) { DB::Person.create name: 'Woody' }
+    let (:people) { People.new }
+    let(:buzz)    { DB::Person.create name: 'Buzz Lightyear' }
+    let(:woody)   { DB::Person.create name: 'Woody' }
 
     before do
       buzz && woody
@@ -44,12 +48,12 @@ describe Gummi::RepositoryLayer::Repository do
     end
 
     it 'sorts correctly' do
-      People.search(sort: { name: :asc  }).records.map(&:name).should == [buzz.name, woody.name]
-      People.search(sort: { name: :desc }).records.map(&:name).should == [woody.name, buzz.name]
+      people.search(sort: { name: :asc  }).records.map(&:name).should == [buzz.name, woody.name]
+      people.search(sort: { name: :desc }).records.map(&:name).should == [woody.name, buzz.name]
     end
 
     it 'finds the correct documents' do
-      result = People.search do |search|
+      result = people.search do |search|
         search.query_string = 'Woody'
         search.facets[:names] = { terms: { field: :name, all_terms: true, size: 100 } }
       end
@@ -59,7 +63,7 @@ describe Gummi::RepositoryLayer::Repository do
     end
 
     it 'converts the result to entities' do
-      result = People.search do |search|
+      result = people.search do |search|
         search.query_string = 'Woody'
       end
       woody = result.records.first

data/spec/lib/repobahn/repository_spec.rb

@@ -52,9 +52,10 @@ describe Repobahn::Repository do
     let(:db1) { DB::City.new name: 'New York' }
     let(:db2) { DB::City.new name: 'Boston' }
     let(:dbs) { [db1, db2] }
+    let(:cities) { Cities.new }
 
     it 'converts DB instances to Entities' do
-      entities = Cities.db_instances_to_entities dbs
+      entities = cities.db_instances_to_entities dbs
       entities.size.should == 2
       entities.first.should be_instance_of City
       entities.second.should be_instance_of City
@@ -63,7 +64,7 @@ describe Repobahn::Repository do
     end
 
     it 'returns a single Entity if a single DB instance is passed in' do
-      entity = Cities.db_instances_to_entities db1
+      entity = cities.db_instances_to_entities db1
       entity.should be_instance_of City
       entity.name.should == 'New York'
     end

data/spec/support/models/people.rb

@@ -6,7 +6,7 @@ class People
 
   after_conversion :convert_name
 
-  def self.convert_name(entity, db)
+  def convert_name(entity, db)
     entity.converted_name = db.name.reverse
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gummi
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -232,7 +232,6 @@ files:
 - lib/gummi/version.rb
 - lib/repobahn/entity.rb
 - lib/repobahn/repository.rb
-- lib/repobahn/repository/active_record.rb
 - spec/lib/gummi/db_layer/document_spec.rb
 - spec/lib/gummi/entity_layer/entity_spec.rb
 - spec/lib/gummi/repository_layer/repository_spec.rb
@@ -270,12 +269,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1073963271275319698
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1073963271275319698
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/repobahn/repository/active_record.rb

@@ -1,17 +0,0 @@
-module Repobahn
-  module Repository
-    module ActiveRecord
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-
-        def find(id)
-          record = document_class.find id.to_i
-          document_to_entity record if record
-        end
-
-      end
-
-    end
-  end
-end