lotus-model 0.1.0 → 0.1.1

data/lib/lotus/model/mapper.rb

@@ -2,7 +2,7 @@ require 'lotus/model/mapping'
 
 module Lotus
   module Model
-    # A persistence mapper that keep entities independent from database details.
+    # A persistence mapper that keeps entities independent from database details.
     #
     # This is database independent. It can work with SQL, document, and even
     # with key/value stores.
@@ -42,7 +42,7 @@ module Lotus
       #
       #   * #initialize(collection) # Lotus::Model::Mapping::Collection
       #   * #to_record(entity)      # translates an entity to the database type
-      #   * #from_record(record)    # translates a record into an  entity
+      #   * #from_record(record)    # translates a record into an entity
       #   * #deserialize_*(value)   # a set of methods, one for each database column.
       #
       # If not given, it uses `Lotus::Model::Mapping::Coercer`, by default.
@@ -93,7 +93,7 @@ module Lotus
       #
       # @since 0.1.0
       def load!
-        @collections.each {|_, collection| collection.load! }
+        @collections.each_value { |collection| collection.load! }
         self
       end
     end

data/lib/lotus/model/mapping/coercer.rb

@@ -1,4 +1,4 @@
-require 'lotus/utils/kernel'
+require 'lotus/model/mapping/coercer'
 
 module Lotus
   module Model
@@ -42,7 +42,7 @@ module Lotus
         end
 
         private
-        # Compile itself for perfomance boost.
+        # Compile itself for performance boost.
         #
         # @api private
         # @since 0.1.0
@@ -50,7 +50,7 @@ module Lotus
           code = @collection.attributes.map do |_,(klass,mapped)|
             %{
             def deserialize_#{ mapped }(value)
-              Lotus::Utils::Kernel.#{klass}(value)
+              Lotus::Model::Mapping::Coercions.#{klass}(value)
             end
             }
           end.join("\n")
@@ -66,7 +66,7 @@ module Lotus
 
             def from_record(record)
               #{ @collection.entity }.new(
-                Hash[*[#{ @collection.attributes.map{|name,(klass,mapped)| ":#{name},Lotus::Utils::Kernel.#{klass}(record[:#{mapped}])"}.join(',') }]]
+                Hash[*[#{ @collection.attributes.map{|name,(klass,mapped)| ":#{name},Lotus::Model::Mapping::Coercions.#{klass}(record[:#{mapped}])"}.join(',') }]]
               )
             end
 

data/lib/lotus/model/mapping/coercions.rb

@@ -0,0 +1,162 @@
+require 'lotus/utils/kernel'
+
+module Lotus
+  module Model
+    module Mapping
+      # Coercions utilities
+      #
+      # @since 0.1.1
+      module Coercions
+        # Coerce into an Array, unless the argument is nil
+        #
+        # @param arg [Object] the object to coerce
+        #
+        # @return [Array] the result of the coercion
+        #
+        # @raise [TypeError] if the argument can't be coerced
+        #
+        # @since 0.1.1
+        #
+        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Array-class_method
+        def self.Array(arg)
+          Utils::Kernel.Array(arg) unless arg.nil?
+        end
+
+        # Coerce into a Boolean, unless the argument is nil
+        #
+        # @param arg [Object] the object to coerce
+        #
+        # @return [Boolean] the result of the coercion
+        #
+        # @raise [TypeError] if the argument can't be coerced
+        #
+        # @since 0.1.1
+        #
+        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Boolean-class_method
+        def self.Boolean(arg)
+          Utils::Kernel.Boolean(arg) unless arg.nil?
+        end
+
+        # Coerce into a Date, unless the argument is nil
+        #
+        # @param arg [Object] the object to coerce
+        #
+        # @return [Date] the result of the coercion
+        #
+        # @raise [TypeError] if the argument can't be coerced
+        #
+        # @since 0.1.1
+        #
+        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Date-class_method
+        def self.Date(arg)
+          Utils::Kernel.Date(arg) unless arg.nil?
+        end
+
+        # Coerce into a DateTime, unless the argument is nil
+        #
+        # @param arg [Object] the object to coerce
+        #
+        # @return [DateTime] the result of the coercion
+        #
+        # @raise [TypeError] if the argument can't be coerced
+        #
+        # @since 0.1.1
+        #
+        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#DateTime-class_method
+        def self.DateTime(arg)
+          Utils::Kernel.DateTime(arg) unless arg.nil?
+        end
+
+        # Coerce into a Float, unless the argument is nil
+        #
+        # @param arg [Object] the object to coerce
+        #
+        # @return [Float] the result of the coercion
+        #
+        # @raise [TypeError] if the argument can't be coerced
+        #
+        # @since 0.1.1
+        #
+        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Float-class_method
+        def self.Float(arg)
+          Utils::Kernel.Float(arg) unless arg.nil?
+        end
+
+        # Coerce into a Hash, unless the argument is nil
+        #
+        # @param arg [Object] the object to coerce
+        #
+        # @return [Hash] the result of the coercion
+        #
+        # @raise [TypeError] if the argument can't be coerced
+        #
+        # @since 0.1.1
+        #
+        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Hash-class_method
+        def self.Hash(arg)
+          Utils::Kernel.Hash(arg) unless arg.nil?
+        end
+
+        # Coerce into an Integer, unless the argument is nil
+        #
+        # @param arg [Object] the object to coerce
+        #
+        # @return [Integer] the result of the coercion
+        #
+        # @raise [TypeError] if the argument can't be coerced
+        #
+        # @since 0.1.1
+        #
+        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Integer-class_method
+        def self.Integer(arg)
+          Utils::Kernel.Integer(arg) unless arg.nil?
+        end
+
+        # Coerce into a Set, unless the argument is nil
+        #
+        # @param arg [Object] the object to coerce
+        #
+        # @return [Set] the result of the coercion
+        #
+        # @raise [TypeError] if the argument can't be coerced
+        #
+        # @since 0.1.1
+        #
+        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Set-class_method
+        def self.Set(arg)
+          Utils::Kernel.Set(arg) unless arg.nil?
+        end
+
+        # Coerce into a String, unless the argument is nil
+        #
+        # @param arg [Object] the object to coerce
+        #
+        # @return [String] the result of the coercion
+        #
+        # @raise [TypeError] if the argument can't be coerced
+        #
+        # @since 0.1.1
+        #
+        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#String-class_method
+        def self.String(arg)
+          Utils::Kernel.String(arg) unless arg.nil?
+        end
+
+        # Coerce into a Time, unless the argument is nil
+        #
+        # @param arg [Object] the object to coerce
+        #
+        # @return [Time] the result of the coercion
+        #
+        # @raise [TypeError] if the argument can't be coerced
+        #
+        # @since 0.1.1
+        #
+        # @see http://rdoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Time-class_method
+        def self.Time(arg)
+          Utils::Kernel.Time(arg) unless arg.nil?
+        end
+      end
+    end
+  end
+end

data/lib/lotus/model/mapping/collection.rb

@@ -87,7 +87,7 @@ module Lotus
 
         # Defines the entity that is persisted with this collection.
         #
-        # The entity can be any kind of object as long it implements the
+        # The entity can be any kind of object as long as it implements the
         # following interface: `#initialize(attributes = {})`.
         #
         # @param klass [Class] the entity persisted with this collection.
@@ -165,7 +165,7 @@ module Lotus
         # This is storage independent. For instance, it can map an SQL column,
         # a MongoDB attribute or everything that makes sense for your database.
         #
-        # Each attribute defines an Ruby type, to coerce that value from the
+        # Each attribute defines a Ruby type, to coerce that value from the
         # database. This fixes a huge problem, because database types don't
         # match Ruby types.
         # Think of Redis, where everything is stored as a string or integer,

data/lib/lotus/model/version.rb

@@ -3,6 +3,6 @@ module Lotus
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/lib/lotus/repository.rb

@@ -2,11 +2,11 @@ require 'lotus/utils/class_attribute'
 
 module Lotus
   # Mediates between the entities and the persistence layer, by offering an API
-  # to query and execute commands on a databse.
+  # to query and execute commands on a database.
   #
   #
   #
-  # IMPORTANT: A repository MUST be named after an entity, by appeding the
+  # IMPORTANT: A repository MUST be named after an entity, by appending the
   # `Repository` suffix to the entity class name.
   #
   # @example
@@ -28,15 +28,15 @@ module Lotus
   #
   #
   #
-  # A repository is storage idenpendent.
+  # A repository is storage independent.
   # All the queries and commands are delegated to the current adapter.
   #
   # This architecture has several advantages:
   #
-  #   * Applications depends on an abstract API, instead of low level details
+  #   * Applications depend on an abstract API, instead of low level details
   #     (Dependency Inversion principle)
   #
-  #   * Applications depends on a stable API, that doesn't change if the
+  #   * Applications depend on a stable API, that doesn't change if the
   #     storage changes
   #
   #   * Developers can postpone storage decisions
@@ -266,10 +266,10 @@ module Lotus
       #   article = Article.new(title: 'Introducing Lotus::Model')
       #   article.id # => nil
       #
-      #   ArticleRepository.persist(article) # creates a record
+      #   ArticleRepository.create(article) # creates a record
       #   article.id # => 23
       #
-      #   ArticleRepository.persist(article) # no-op
+      #   ArticleRepository.create(article) # no-op
       def create(entity)
         unless entity.id
           @adapter.create(collection, entity)
@@ -519,7 +519,7 @@ module Lotus
       # IMPORTANT: This feature works only with the Sql adapter.
       #
       # A repository is storage independent.
-      # All the queries are deletegated to the current adapter, which is
+      # All the queries are delegated to the current adapter, which is
       # responsible to implement a querying API.
       #
       # Lotus::Model is shipped with two adapters:
@@ -581,7 +581,7 @@ module Lotus
         @adapter.query(collection, self, &blk)
       end
 
-      # Negates the filtering conditions of a the given query with the logical
+      # Negates the filtering conditions of a given query with the logical
       # opposite operator.
       #
       # This is only supported by the SqlAdapter.

data/lotus-model.gemspec

@@ -13,15 +13,15 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'http://lotusrb.org'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z -- lib/* CHANGELOG.md EXAMPLE.md LICENSE.md README.md lotus-model.gemspec`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'lotus-utils', '~> 0.1', '> 0.1.0'
+  spec.add_runtime_dependency 'lotus-utils', '~> 0.2'
   spec.add_runtime_dependency 'sequel',      '~> 4.9'
 
-  spec.add_development_dependency 'bundler',  '~> 1.5'
+  spec.add_development_dependency 'bundler',  '~> 1.6'
   spec.add_development_dependency 'minitest', '~> 5'
   spec.add_development_dependency 'rake',     '~> 10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lotus-model
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-utils
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -94,14 +88,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- ".yardopts"
+- CHANGELOG.md
 - EXAMPLE.md
-- Gemfile
-- LICENSE.txt
+- LICENSE.md
 - README.md
-- Rakefile
 - lib/lotus-model.rb
 - lib/lotus/entity.rb
 - lib/lotus/model.rb
@@ -118,24 +108,11 @@ files:
 - lib/lotus/model/mapper.rb
 - lib/lotus/model/mapping.rb
 - lib/lotus/model/mapping/coercer.rb
+- lib/lotus/model/mapping/coercions.rb
 - lib/lotus/model/mapping/collection.rb
 - lib/lotus/model/version.rb
 - lib/lotus/repository.rb
 - lotus-model.gemspec
-- test/entity_test.rb
-- test/fixtures.rb
-- test/model/adapters/abstract_test.rb
-- test/model/adapters/implementation_test.rb
-- test/model/adapters/memory/query_test.rb
-- test/model/adapters/memory_adapter_test.rb
-- test/model/adapters/sql/query_test.rb
-- test/model/adapters/sql_adapter_test.rb
-- test/model/mapper_test.rb
-- test/model/mapping/coercer_test.rb
-- test/model/mapping/collection_test.rb
-- test/repository_test.rb
-- test/test_helper.rb
-- test/version_test.rb
 homepage: http://lotusrb.org
 licenses:
 - MIT
@@ -160,19 +137,5 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A persistence layer for Lotus
-test_files:
-- test/entity_test.rb
-- test/fixtures.rb
-- test/model/adapters/abstract_test.rb
-- test/model/adapters/implementation_test.rb
-- test/model/adapters/memory/query_test.rb
-- test/model/adapters/memory_adapter_test.rb
-- test/model/adapters/sql/query_test.rb
-- test/model/adapters/sql_adapter_test.rb
-- test/model/mapper_test.rb
-- test/model/mapping/coercer_test.rb
-- test/model/mapping/collection_test.rb
-- test/repository_test.rb
-- test/test_helper.rb
-- test/version_test.rb
+test_files: []
 has_rdoc: