swiss_db 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04bd172ce896a99dd76a23f2670409210a16cbd3
-  data.tar.gz: 234b633535968c2761a3cba2bc056cec691716d9
+  metadata.gz: 4566df7d0cf57f2b234c41c3d6422b83f80385c3
+  data.tar.gz: 745d33640c3c028f2312a8ae2cdbe57664447e35
 SHA512:
-  metadata.gz: 8a780767d3fed17e7b36f145a678584e48b7d835c799a9af4732d5cf8ec5ce2d7f17cae428b824b713816209f8746980414791a75e64f736f63125b4db85911a
-  data.tar.gz: cfa8a60bd0dfd045bc8f46823e2373afee309b59734fbe4f26a93ea7c6bf22c30b0930304ff6ca7b7d934d0e90a9f1b7340886acc452404b5f2e37d0d1106836
+  metadata.gz: d2f2ef4b40a7c083c48fa403c159f2d6f61af54e5a2097c841dc677b24e5b20dad0712676d6d95318cf71eb34b9ab18a2df6446759332bfb5d278ccc9062a7cf
+  data.tar.gz: 6bde8c2b157c12710a6a00985e08341ecd9e4a751aadb8eed9c274972f2b01da19e950b9e010f04bcbf95caca80026d2d2941f6b59c23e15582ed7c7b186f483

data/README.md

@@ -91,6 +91,8 @@ end
 
 That's it! #all, #last, #first, #count, #save, #update_attribute and the usual are now available!
 
+As of 0.7.1 all returned objects are SwissModel instances. Model methods will now work properly.
+
 # Planned
 
 * update_attributes support

data/lib/swiss_db/cursor.rb

@@ -3,22 +3,22 @@
 # Convenience methods over the standard cursor
 # Used by Swiss DataStore
 
-class CursorModel
+# class CursorModel # won't use model properties (custom methods)
 
-  def initialize(h)
-    h.each do |k,v|
-      instance_variable_set("@#{k}", v)
-    end
-  end
+#   def initialize(h)
+#     h.each do |k,v|
+#       instance_variable_set("@#{k}", v)
+#     end
+#   end
 
-  def method_missing(methId, *args)
-    str = methId.id2name
-    instance_variable_get("@#{str}")
-  end
+#   def method_missing(methId, *args)
+#     str = methId.id2name
+#     instance_variable_get("@#{str}")
+#   end
 
-end
+# end
 
-class Cursor # < Array
+class Cursor
 
   FIELD_TYPE_BLOB    = 4
   FIELD_TYPE_FLOAT   = 2
@@ -34,55 +34,63 @@ class Cursor # < Array
     @values = {}
   end
 
+  def model
+    @model
+  end
+
   def first
+    return nil if count == 0
     cursor.moveToFirst ? self : nil
+    model.new(to_hash, cursor)
   end
 
   def last
+    return nil if count == 0
     cursor.moveToLast ? self : nil
+    model.new(to_hash, cursor)
   end
 
   def [](pos)
+    return nil if count == 0
     cursor.moveToPosition(pos) ? self : nil
+    model.new(to_hash, cursor)
+  end
+
+  def to_hash
+      hash_obj = {}
+      $current_schema[model.table_name].each do |k, v|
+        hash_obj[k.to_sym] = self.send(k.to_sym)
+      end
+      hash_obj
   end
 
   def to_a
+    return nil if count == 0
     arr = []
     (0...count).each do |i|
       # puts i
-      hash_obj = {}
       cursor.moveToPosition(i)
-      $current_schema[model.table_name].each do |k, v|
-        hash_obj[k.to_sym] = self.send(k.to_sym)
-      end
-      arr << CursorModel.new(hash_obj)
+      arr << model.new(to_hash, cursor)
     end
     arr
   end
 
+  # todo: take out setter code. it's not used anymore. leave the getter code. it is used. (see #to_hash)
+
   def method_missing(methId, *args)
     method_name = methId.id2name
-
-    if valid_setter_getter?(method_name)
-      handle_get_or_set(method_name, args)
+    # puts "cursor method missing #{method_name}"
+    if valid_getter?(method_name)
+      get_method(method_name)
     else
       super
     end
   end
 
-  def valid_setter_getter?(method_name)
-    method_name.chop! if is_setter? method_name
+  def valid_getter?(method_name)
     column_names.include? method_name
   end
 
-  def handle_get_or_set(method_name, args)
-    if is_setter? method_name
-      set_method(args)
-    else
-      get_method(method_name)
-    end
-  end
-
   def is_setter?(method_name)
     method_name[-1] == '='
   end
@@ -105,23 +113,6 @@ class Cursor # < Array
     end
   end
 
-  def set_method(method_name, args)
-    @values[method_name.chop] = args[0]
-  end
-
-  def save
-    primary_key = model.primary_key
-    pk_value = self.send(primary_key.to_sym)
-    model.store.update(model.table_name, @values, {primary_key => pk_value})
-  end
-
-  # we are updating an existing row.. makes more sense on cursor...
-  def update_attribute(key, value)
-    primary_key = model.primary_key
-    pk_value = self.send(primary_key.to_sym)
-    model.store.update(model.table_name, {key => value}, {primary_key => pk_value})
-  end
-
   def count
     cursor.getCount
   end

data/lib/swiss_db/swiss_model.rb

@@ -9,7 +9,41 @@ class SwissModel
   #    puts "New subclass: #{subclass.class.name.split('.').last}"
   # end
 
-  # attr_accessor :table_name, :class_name
+  attr_accessor :cursor, :values
+
+  def initialize(h, cursor)
+    @cursor = cursor
+    h.each do |k,v|
+      instance_variable_set("@#{k}", v)
+    end
+    @values = {}
+  end
+
+  def method_missing(methId, *args)
+    str = methId.id2name
+    if instance_variable_get("@#{str}")
+      return instance_variable_get("@#{str}")
+    elsif str[-1] == '=' # setter
+      @values[str.chop] = args[0]
+    end
+  end
+
+  def save
+    pk_value = self.send(self.class.primary_key.to_sym)
+    self.class.store.update(self.class.table_name, @values, {self.class.primary_key => pk_value})
+  end
+
+  def update_attribute(key, value)
+    pk_value = self.send(self.class.primary_key.to_sym)
+    self.class.store.update(self.class.table_name, {key => value}, {self.class.primary_key => pk_value})
+  end
+
+  def update_attributes(hash)
+    hash.each do |k, v|
+      update_attribute(k, v)
+    end
+  end
+
 
   def self.store
     context = DataStore.context

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swiss_db
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Jonathan Silverman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler