motion_record 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDdiYmE3NTlmNjMzMmVjN2UwMmJhNjk1YTRlOGFlYmQxYjVmMmNkYQ==
-  data.tar.gz: !binary |-
-    YTgzNmU2OTFhMzVhNjRiYWZlNGY1MjZiZDQ0MWI5Njk0Y2VlMTQ3Zg==
+SHA1:
+  metadata.gz: 806d2c421426bad6f8c077bcd5a6d12e74015367
+  data.tar.gz: 2a906afefcc90eecd49b3f03badeda1bee7f3171
 SHA512:
-  metadata.gz: !binary |-
-    NWVkNjgwMjUwYzBkNjgzY2FhNmY5OTM1YWI0N2M1Nzk4ZjQ2N2M5YWE5MTc4
-    NDViNWZkYmQ0NjhlZTFlMzM5NjAyOGIwNTMzYjQzNzEzMDhkNGE0OTkzZWM4
-    MTRkNDg4ZTA1N2NiYWJmNjBiZDcwY2I0Mjk5NTI0NzdjZWNjZmI=
-  data.tar.gz: !binary |-
-    ZDkxM2Y1ODI4NTFmYmExZjMwZjM2MzEzOTgxMjRiNWYyYWM1ODlmNWE4YWJk
-    MTNlNTY5ZTMyOTExZWE2ODRjYzRkYTZjODYyNDYzZGQ4ZGUxYjJjMmNhMmEy
-    YjMyYTRlMmRiYzhmNDIwOTUyMzEzOWM4MmRmMWI1Njk2M2U2MDY=
+  metadata.gz: e46095019c1d27c71be32543d3b8896f909a0f64446e4fdd6a76d8e39e2d59fbcb00bdc806206a17fa5554e9b0f73264b7769deb79d5b25dbdc6281d554be082
+  data.tar.gz: f314d3c7defa369ab86623572789dcea5f9c0127e46a45325100a4ccd64b4846779c336a3c31525dd39199403e9525e078cb0eb58c7f454b7159409b38cddf4f

data/README.md

@@ -6,9 +6,9 @@ MotionRecord
 Everything you need to start using SQLite as the datastore for your RubyMotion
 app.
 
-:turtle: Android support should be coming soon
+:turtle: Android support should be [coming soon](https://github.com/magoosh/motion_record/issues/3)
 
-[![Code Climate](https://codeclimate.com/github/magoosh/motion_record/badges/gpa.svg)](https://codeclimate.com/github/magoosh/motion_record) [![Test Coverage](https://codeclimate.com/github/magoosh/motion_record/badges/coverage.svg)](https://codeclimate.com/github/magoosh/motion_record)
+[![Gem Version](https://badge.fury.io/rb/motion_record.svg)](http://badge.fury.io/rb/motion_record) [![Code Climate](https://codeclimate.com/github/magoosh/motion_record/badges/gpa.svg)](https://codeclimate.com/github/magoosh/motion_record) [![Test Coverage](https://codeclimate.com/github/magoosh/motion_record/badges/coverage.svg)](https://codeclimate.com/github/magoosh/motion_record)
 
 Installation
 ------------
@@ -35,7 +35,38 @@ And then execute:
 $ bundle
 ```
 
-* TODO: Android???
+MotionRecord::Base
+------------------
+
+MotionRecord::Base provides a superclass for defining objects which are stored
+in the database.
+
+```ruby
+class Message < MotionRecord::Base
+  # That's all!
+end
+```
+
+Attribute methods are inferred from the associated SQLite table definition.
+
+```ruby
+message = Message.new(subject: "Welcome!", body: "If you have any questions...")
+# => #<Message: @id=nil @subject="Welcome!" @body="If you have any..." ...>
+message.satisfaction
+# => 0.0
+```
+
+Manage persistence with `save!`, `delete!`, and `persisted?`
+
+```ruby
+message = Message.new(subject: "Welcome!", body: "If you have any questions...")
+message.save!
+message.id
+# => 1
+message.delete!
+message.persisted?
+# => false
+```
 
 MotionRecord::Schema
 --------------------
@@ -82,41 +113,6 @@ which will be cleared every time the app process is killed.
 MotionRecord::Schema.up!(file: :memory) # ...
 ```
 
-MotionRecord::Base
-------------------
-
-MotionRecord::Base provides a superclass for defining objects which are stored
-in the database.
-
-```ruby
-class Message < MotionRecord::Base
-  # That's all!
-end
-```
-
-Attribute methods are inferred from the associated SQLite table definition.
-
-```ruby
-message = Message.new(subject: "Welcome!", body: "If you have any questions...")
-# => #<Message: @id=nil @subject="Welcome!" @body="If you have any..." ...>
-message.satisfaction
-# => 0.0
-```
-
-Manage persistence with `save!`, `delete!`, and `persisted?`
-
-```ruby
-message = Message.new(subject: "Welcome!", body: "If you have any questions...")
-message.save!
-message.id
-# => 1
-message.delete!
-message.persisted?
-# => false
-```
-
-* TODO: Better default inflection of class names to table names
-
 MotionRecord::Scope
 -------------------
 
@@ -141,8 +137,6 @@ Message.where(read_at: nil).find_all
 Message.where(read_at: nil).update_all(read_at: Time.now.to_i)
 ```
 
-* TODO: Return "rows modified" count for update_all and delete_all
-
 Run calculations on scopes with `count`, `sum`, `maximum`, `minimum`, and
 `average`.
 
@@ -153,9 +147,6 @@ Message.where(subject: "How do you like the app?").maximum(:satisfaction)
 # => 10.0
 ```
 
-* TODO: Predicates for comparisons other than `=`
-* TODO: Handle datatype conversion in `where` and `update_all`
-
 MotionRecord::Serialization
 ----------------------------------
 
@@ -203,8 +194,6 @@ Survey.first
 # => #<Survey: @id=1 @response={"nps"=>10, "what_can_we_improve"=>"Nothing :)"}>
 ```
 
-* TODO: Make JSON serializer cross-platform
-
 #### Custom Serializers
 
 To write a custom serializer, extend MotionRecord::Serialization::BaseSerializer
@@ -231,7 +220,7 @@ end
 MotionRecord::Association
 -------------------------
 
-* TODO: has_many and belongs_to
+[TODO](https://github.com/magoosh/motion_record/issues/7)
 
 
 Contributing

data/lib/motion_record/base.rb

@@ -1,6 +1,8 @@
 module MotionRecord
   class Base
+    include Serialization
     include Persistence
+    include ScopeHelpers
 
     def initialize(attributes={})
       initialize_from_attribute_hash(attributes)

data/lib/motion_record/persistence.rb

@@ -13,10 +13,6 @@ module MotionRecord
       end
     end
 
-    def primary_key_condition
-      {self.class.primary_key => self.instance_variable_get("@#{self.class.primary_key}")}
-    end
-
     def persisted?
       !!@persisted
     end
@@ -36,7 +32,7 @@ module MotionRecord
       self.class.table_columns
 
       params = self.to_attribute_hash.reject { |k, _v| k == self.class.primary_key }
-      table_params = self.class.to_table_params(params)
+      table_params = self.class.serialize_table_params(params)
 
       if persisted?
         self.class.where(primary_key_condition).update_all(table_params)
@@ -47,10 +43,11 @@ module MotionRecord
       self.mark_persisted!
     end
 
-    module ClassMethods
-      include MotionRecord::ScopeHelpers::ClassMethods
-      include MotionRecord::Serialization::ClassMethods
+    def primary_key_condition
+      {self.class.primary_key => self.instance_variable_get("@#{self.class.primary_key}")}
+    end
 
+    module ClassMethods
       def create!(attributes={})
         self.new(attributes).save!
       end

data/lib/motion_record/scope.rb

@@ -43,7 +43,11 @@ module MotionRecord
     end
 
     def find_all
-      connection.select(self).map { |row| @klass.from_table_params(row) }
+      connection.select(self).map do |row|
+        record = @klass.new(@klass.deserialize_table_params(row))
+        record.mark_persisted!
+        record
+      end
     end
 
     def pluck(attribute)

data/lib/motion_record/scope_helpers.rb

@@ -85,5 +85,9 @@ module MotionRecord
         Scope.new(self)
       end
     end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
   end
 end

data/lib/motion_record/serialization.rb

@@ -23,19 +23,24 @@ module MotionRecord
         end
       end
 
-      # Build a new object from the Hash result of a SQL query
-      def from_table_params(params)
-        attributes = {}
-        params.each do |name, value|
+      # Deserialize a Hash of attributes from their database representation
+      #
+      # params - a Hash of Symbol column names to SQLite values
+      #
+      # Returns a Hash with all values replaced by their deserialized versions
+      def deserialize_table_params(params)
+        params.each_with_object({}) do |name_and_value, attributes|
+          name, value = name_and_value
           attributes[name.to_sym] = serializer(name.to_sym).deserialize(value)
         end
-        record = self.new(attributes)
-        record.mark_persisted!
-        record
       end
 
       # Serialize a Hash of attributes to their database representation
-      def to_table_params(hash)
+      #
+      # params - a Hash of Symbol column names to their attribute values
+      #
+      # Returns a Hash with all values replaced by their serialized versions
+      def serialize_table_params(hash)
         hash.each_with_object({}) do |attribute_and_value, params|
           attribute, value = attribute_and_value
           params[attribute] = serializer(attribute).serialize(value)
@@ -64,5 +69,9 @@ module MotionRecord
         serializer_classes[attribute].new(table_columns[attribute])
       end
     end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
   end
 end

data/lib/motion_record/version.rb

@@ -1,3 +1,3 @@
 module MotionRecord
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/motion_record.rb

@@ -26,7 +26,9 @@ Motion::Project::App.setup do |app|
 
   # Some files don't have the same dependency order and alphabetic order
   {
-    "motion_record/persistence.rb" => "motion_record/scope_helpers.rb"
+    "motion_record/base.rb" => "motion_record/persistence.rb",
+    "motion_record/base.rb" => "motion_record/serialization.rb",
+    "motion_record/base.rb" => "motion_record/scope_helpers.rb"
   }.each do |file, dependency|
     app.files_dependencies File.join(dirname, file) => File.join(dirname, dependency)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_record
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Zach Millman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,14 +28,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Mini ActiveRecord for RubyMotion
@@ -82,12 +82,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []