reorm 0.1.8 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0926ae773897fa1ab0198afe1c4577ccfdeea99c
-  data.tar.gz: 2f6d59a5ff0e3bbc41daa49262d62a20007f0956
+  metadata.gz: 9fbf3a40fc80bdd3c3803014234f9fadcde74ad3
+  data.tar.gz: 38d870a011a1fd0872ef64f63f63b53bc70dd7c9
 SHA512:
-  metadata.gz: 048f6fd28385581a438c97804d93fc4e2e384af5e2e6f5efcaf35f26a810a6fa74c4f03cf32c62c0836eae0f78201d86216e0244a91d6c4ed9bc17d69212dffb
-  data.tar.gz: 4c1198b1673b3b7867c49caaeef97ed0a7dfd3c2b1e266223305e159973d887ec90cb05d6cc7db6810aecd9d5cd2d23e184664c3abe8706629e9011a20b53b47
+  metadata.gz: 3a4b190166c7882ebfa1a5c4c1d42ff54da07948b4b4c0930234f03d738d1482068974df822ad67c4167353df70a40b32f8ffff08dfeacf24180014aeb102920
+  data.tar.gz: 4036786a08d0ded1844089cfa56b7d4b6871f02bd4c4a999b481c76949803ac1b630ece858ab648c4ef97c951517e032cd7b19aab199b1f471b82fa56b302159

data/lib/reorm/cursor.rb

@@ -60,7 +60,7 @@ module Reorm
       end
       data    = @order_by.nil? ? @cursor.next : @cursor[@offset]
       @offset += 1
-      model_class.new(data)
+      model_for(data)
     end
 
     def each(&block)
@@ -78,7 +78,7 @@ module Reorm
       model = nil
       if offset >= 0 && offset < count
         Reorm.connection do |connection|
-          model = model_class.new(@query.nth(offset).run(connection))
+          model = model_for(@query.nth(offset).run(connection))
         end
       end
       model
@@ -100,7 +100,7 @@ module Reorm
       Cursor.new(model_class, @query.limit(size), @order_by)
     end
 
-    def offset(index)
+    def offset(quantity)
       Cursor.new(model_class, @query.skip(quantity), @order_by)
     end
     alias :skip :offset
@@ -151,7 +151,7 @@ module Reorm
     def each_with_order_by
       Reorm.connection do |connection|
         @query.order_by(*@order_by).run(connection).each do |record|
-          yield model_class.new(record)
+          yield model_for(record)
         end
       end
     end
@@ -161,12 +161,18 @@ module Reorm
         cursor = @query.run(connection)
         begin
           cursor.each do |record|
-            yield model_class.new(record)
+            yield model_for(record)
           end
         ensure
           cursor.close
         end
       end
     end
+
+    def model_for(properties)
+      model = model_class.new
+      model.assign_properties(properties)
+      model
+    end
   end
 end

data/lib/reorm/model.rb

@@ -123,6 +123,13 @@ module Reorm
       self
     end
 
+    def assign_properties(properties={})
+      properties.each do |key, value|
+        @properties[key.to_sym] = value
+      end
+      self
+    end
+
     def respond_to?(method_name, include_private=false)
       method_name.to_s[-1, 1] == "=" || @properties.include?(property_name(method_name)) || super
     end
@@ -143,6 +150,20 @@ module Reorm
       {}.merge(@properties)
     end
 
+    def self.get(id)
+      model = nil
+      Reorm.connection do |connection|
+        if table_exists?(table_name, connection)
+          properties = r.table(table_name).get(id).run(connection)
+          if !properties.nil?
+            model = self.new
+            model.assign_properties(properties)
+          end
+        end
+      end
+      model
+    end
+
     def self.create(properties={})
       object = self.new(properties)
       object.save
@@ -172,10 +193,17 @@ module Reorm
     end
 
     def ensure_table_exists(connection)
-      tables = r.table_list.run(connection)
-      if !tables.include?(table_name)
+      if !table_exists?(table_name, connection)
         r.table_create(table_name, primary_key: primary_key).run(connection)
       end
     end
+
+    def table_exists?(name, connection)
+      Model.table_exists?(name, connection)
+    end
+
+    def self.table_exists?(name, connection)
+      r.table_list.run(connection).include?(name)
+    end
   end
 end

data/lib/reorm/version.rb

@@ -1,6 +1,6 @@
 module Reorm
   MAJOR_VERSION              = 0
   MINOR_VERSION              = 1
-  BUILD_VERSION              = 8
+  BUILD_VERSION              = 11
   VERSION                    = "#{MAJOR_VERSION}.#{MINOR_VERSION}.#{BUILD_VERSION}"
 end

data/spec/reorm/cursor_spec.rb

@@ -221,4 +221,18 @@ describe Reorm::Cursor do
       expect(CursorTestModel.all.count).to eq(2)
     end    
   end
+
+  describe "#offset()" do
+    it "moves the starting point for records retrieved" do
+      expect(subject.count).to eq(5)
+      expect(subject.offset(2).count).to eq(3)
+    end
+  end
+
+  describe "#limit()" do
+    it "restricts the number of records to be retrieved" do
+      expect(subject.count).to eq(5)
+      expect(subject.limit(2).count).to eq(2)
+    end
+  end
 end

data/spec/reorm/model_spec.rb

@@ -389,6 +389,35 @@ describe Reorm::Model do
     end
   end
 
+  describe "#assign_properties()" do
+    subject {
+      SetterTestModel.new
+    }
+
+    it "assigns model properties but bypasses explicit assignment methods" do
+      subject.assign_properties(value: "Value.")
+      expect(subject.value).to eq("Value.")
+      expect(subject.called).to be_nil
+    end
+  end
+
+  describe "#get()" do
+    let(:model) {
+      SaveTestModel.create(one: 1)
+    }
+
+    it "returns a model instance that matches the key if one exists" do
+      object = SaveTestModel.get(model.id)
+      expect(object).not_to be_nil
+      expect(object.id).to eq(model.id)
+      expect(object.one).to eq(1)
+    end
+
+    it "returns nil if a match record could not be found" do
+      expect(SaveTestModel.get(SecureRandom.uuid)).to be_nil
+    end
+  end
+
 	describe "#create()" do
 		let(:standin) {
 			SaveTestModel.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reorm
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.11
 platform: ruby
 authors:
 - Peter Wood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A library for use with the RethinkDB application.