lotus-model 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae1042adba4d02f0e12ad69ccb025061603a3b24
-  data.tar.gz: 0c976c625163281c1d8e03409f1ff79db9838ba6
+  metadata.gz: e2e425209e8c06b8546835d70e26fc450b72ff16
+  data.tar.gz: 85e4168062b4a9482250c8da8e76281b60665760
 SHA512:
-  metadata.gz: 91017c7d534780cb9dd7004969835762c1185596845ac8b9a968d762af7913709ddfbd17d5b68daea1c6851152a3b45e6135d2b23b65f548619b77f22a5d8ec5
-  data.tar.gz: 5a40607f634bdea786e3d2f6005d14acc5f27160f01bb6cb0a0f028414a1163bb0612131ba8554cd1264bcfa7086be853054f7e246d55ff17d9797b7ebe83335
+  metadata.gz: c701eb730b887a9810364c410b701bc369914b138704b2defc69f32c9be2d0c27708c5b0bf1b9dc4254fd8d9177f08d7bbd4e920f1ac2039aacec914e5574552
+  data.tar.gz: 8dba1937a0132e6e6bdd80f531ca66aef8a4391d2549dbccd4ed11049a134c06187b5d4138e8e752fc61683cdd84bc0fcc4f91fc8f8432114efbbcabbcce1865

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Lotus::Model
 A persistence layer for Lotus
 
+## v0.2.1 - 2015-01-12
+### Added
+- [Luca Guidi] Compatibility between Lotus::Entity and Lotus::Validations
+
 ## v0.2.0 - 2014-12-23
 ### Added
 - [Luca Guidi] Introduced file system adapter

data/lib/lotus/entity.rb

@@ -79,8 +79,10 @@ module Lotus
     #     include Lotus::Entity
     #   end
     def self.included(base)
-      base.extend ClassMethods
-      base.send :attr_accessor, :id
+      base.class_eval do
+        extend ClassMethods
+        attributes :id
+      end
     end
 
     module ClassMethods
@@ -138,28 +140,31 @@ module Lotus
       #   DeletedUser.attributes => #<Set: {:id, :name, :deleted_at}>
       def attributes(*attrs)
         if attrs.any?
-          self.attributes.merge Lotus::Utils::Kernel.Array(attrs)
-
-          class_eval <<-END_EVAL, __FILE__, __LINE__
-            def initialize(attributes = {})
-              attributes = Lotus::Utils::Attributes.new(attributes)
-              #{@attributes.map do |a|
-                  "@#{a} = attributes.get(:#{a})"
-                 end.join("\n") }
-            end
-          END_EVAL
+          attrs = Lotus::Utils::Kernel.Array(attrs)
+          self.attributes.merge attrs
 
-          attr_accessor *@attributes
+          attrs.each do |attr|
+            attr_accessor(attr) if define_attribute?(attr)
+          end
         else
-          @attributes ||= Set.new([:id])
+          @attributes ||= Set.new
         end
       end
 
+      # Check if attr_reader define the given attribute
+      #
+      # @since 0.2.1
+      # @api private
+      def define_attribute?(name)
+        name == :id ||
+          !instance_methods.include?(name)
+      end
+
       protected
 
       # @see Class#inherited
       def inherited(subclass)
-        subclass.attributes *attributes
+        subclass.attributes(*attributes)
         super
       end
     end
@@ -177,7 +182,8 @@ module Lotus
     # @see .attributes
     def initialize(attributes = {})
       attributes.each do |k, v|
-        public_send("#{ k }=", v)
+        setter = "#{ k }="
+        public_send(setter, v) if respond_to?(setter)
       end
     end
 

data/lib/lotus/model/version.rb

@@ -3,6 +3,6 @@ module Lotus
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

data/lotus-model.gemspec

@@ -6,8 +6,8 @@ require 'lotus/model/version'
 Gem::Specification.new do |spec|
   spec.name          = 'lotus-model'
   spec.version       = Lotus::Model::VERSION
-  spec.authors       = ['Luca Guidi']
-  spec.email         = ['me@lucaguidi.com']
+  spec.authors       = ['Luca Guidi', 'Trung Lê']
+  spec.email         = ['me@lucaguidi.com', 'trung.le@ruby-journal.com']
   spec.summary       = %q{A persistence layer for Lotus}
   spec.description   = %q{A persistence framework with entities, repositories, data mapper and query objects}
   spec.homepage      = 'http://lotusrb.org'

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lotus-model
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Luca Guidi
+- Trung Lê
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-utils
@@ -90,6 +91,7 @@ description: A persistence framework with entities, repositories, data mapper an
   query objects
 email:
 - me@lucaguidi.com
+- trung.le@ruby-journal.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -144,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A persistence layer for Lotus