data_steroid 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d75b802d4f14a15e7d8640a7bf8d95c00339ec53
-  data.tar.gz: 11b36efab09ad1ae2161354185486f4adcbc6c7d
+  metadata.gz: 7a5e186754d83c716132814eb37a50587ffb4415
+  data.tar.gz: db5467bec9ee15e7f7076f2d7394f1648be267dd
 SHA512:
-  metadata.gz: 8f33a2f2538917096de0ae5751c6d0fdc2818e8106dcf456d49b988dfd03074b1e1b259c49ad49b2a56bd7678a5ac22ff45b24662be2a1f61794a54d1e679259
-  data.tar.gz: 8f052b9b11cd68979f65728b5d245051c312003b8b24e386d3b1eb71ee25b332d307f4f341693e0ed38b24ac9a221c1d6be3856e27757805ef0ced4dce051cd0
+  metadata.gz: a6adfc8f9715a5c1e95c0c31840a6d323d89e11fecdc8548bf783658087fbd771754439daaf1c199b587f5d57545cd06aac3c3839312dcaa86cf8fe9d35bee2f
+  data.tar.gz: f1107102e8d085a10636412b5f31396cc063c30a67f9c9b902b91ad2e263e3829eded2421520ae363a1ed68bb3a181ae80e3708ae074a3530f4d5be81f7a5022

data/README.md

@@ -4,13 +4,8 @@ DataSteroid is an ODM (Object-Document-Mapper) framework for Google Datastore in
 
 Install
 -------
-```sh
-gem build data_steroid
-gem install data_steroid-<version>.gem
-```
-or
 ```ruby
-gem 'data_steroid', '~> 0.4.0', git: 'https://github.com/b2beauty/data_steroid'
+gem 'data_steroid'
 ```
 
 Configure
@@ -33,8 +28,8 @@ class Product
   kind 'Product' # Datastore Kind
 
   property :barcode
-  property :name
-  property :price
+  property :name, String # optional type
+  property :price, Float # optional type
 
   validates :barcode, :name, :price, presence: true
 end
@@ -42,7 +37,7 @@ end
 # Example
 
 # Create and save
-product = Product.new { barcode: '7891231231234', name: 'iPhone 7', price: 3000.00 }
+product = Product.new(barcode: '7891231231234', name: 'iPhone 7', price: 3000.00)
 product.save
 
 # Find and update
@@ -61,3 +56,11 @@ all_products_ordered = Product.fetch Product.query.order('name', :asc)
 iphones = Product.fetch Product.query.where('name', '=', 'iPhone 7')
 
 ```
+
+Develop
+-------
+
+```sh
+gem build data_steroid
+gem install data_steroid-<version>.gem
+```

data/lib/data_steroid.rb

@@ -17,4 +17,5 @@ module DataSteroid
   require 'data_steroid/errors/datastore_error'
   require 'data_steroid/persistable'
   require 'data_steroid/timestamps'
+  require 'data_steroid/version'
 end

data/lib/data_steroid/entity/initializable.rb

@@ -5,13 +5,18 @@ module DataSteroid
       extend ActiveSupport::Concern
 
       included do
-        def initialize(options = nil)
+        def initialize(params = nil)
           set_default_values
-          if options.is_a? Google::Cloud::Datastore::Entity
-            properties_names.each { |a| send("#{a}=", options[a.to_s]) }
-            send('id=', options.key.id)
-          elsif options.is_a? ::Hash
-            options.each_pair { |key, value| send("#{key}=", value) }
+          case params
+          when Google::Cloud::Datastore::Entity
+            properties_names.each do |property_name|
+              send("#{property_name}=", params[property_name.to_s])
+            end
+            send('id=', params.key.id)
+          when ::Hash
+            params.each_pair do |key, value|
+              send("#{key}=", value)
+            end
           end
         end
       end

data/lib/data_steroid/properties.rb

@@ -1,3 +1,5 @@
+require 'coercible'
+
 module DataSteroid
   # Define behaviour to properties of entity.
   module Properties
@@ -6,6 +8,10 @@ module DataSteroid
     included do
       class_attribute :properties
 
+      class << self
+        alias_method :property, :add_property
+      end
+
       self.properties = {}
 
       property :id # Default property
@@ -14,7 +20,7 @@ module DataSteroid
         if properties.is_a? ::Hash
           properties.each_pair { |key, value| send("#{key}=", value) }
         else
-          raise Datastore::Errors::DatastoreError.new 'Properties params need is Hash'
+          raise Datastore::Errors::DatastoreError.new 'Properties params must be a Hash'
         end
       rescue
         raise Datastore::Errors::DatastoreError.new 'Property invalid'
@@ -24,32 +30,48 @@ module DataSteroid
         properties.keys
       end
 
+      protected
+
       def set_default_values
         properties.each_pair do |name, options|
-          send("#{name}=", properties[name][:default]) if options.key? :default
+          next unless options.key? :default
+          default = options[:default]
+          # Default might be a lambda
+          value = default.respond_to?(:call) ? default.call : default
+          send("#{name}=", value)
         end
       end
+
+      def coercer
+        @coercer ||= Coercible::Coercer.new
+      end
     end
 
     class_methods do
       protected
 
-      def property(name, options = {})
-        add_property(name.to_s, options)
-      end
-
-      def add_property(name, options)
-        properties[name] = options
-        create_accessors(name)
+      def add_property(name, *args)
+        options = args[-1].is_a?(Hash) ? args.pop : {}
+        options[:type] = args[0] if args[0].is_a?(Class)
+        properties[name.to_s] = options
+        create_accessors(name, options)
+        self
       end
 
       # https://www.leighhalliday.com/ruby-metaprogramming-creating-methods
-      def create_accessors(name)
+      def create_accessors(name, options)
         define_method(name) do # Define get method
           instance_variable_get("@#{name}")
         end
+
         define_method("#{name}=") do |value| # Define set method
-          instance_variable_set("@#{name}", value)
+          coerced_value =
+            if options[:type]
+              coercer[value.class].send("to_#{options[:type].to_s.downcase}", value)
+            else
+              value
+            end
+          instance_variable_set("@#{name}", coerced_value)
         end
       end
     end

data/lib/data_steroid/timestamps.rb

@@ -6,12 +6,12 @@ module DataSteroid
     extend ActiveSupport::Concern
 
     included do
-      property :created_at, default: DateTime.now
+      property :created_at, default: ->{ DateTime.now }
       property :updated_at
 
-      before_save :update_updated_at
+      before_save :set_updated_at
 
-      def update_updated_at
+      def set_updated_at
         self.updated_at = DateTime.now
       end
     end

data/lib/data_steroid/version.rb

@@ -0,0 +1,5 @@
+module DataSteroid
+  # version string
+  # @api public
+  VERSION = '0.5.0'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_steroid
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Fabio Tomio
@@ -11,19 +11,19 @@ cert_chain: []
 date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: google-cloud-datastore
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: coercible
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: google-cloud-datastore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
 description: Simple ODM to Google Datastore based on Mongoid
 email: fabiotomio@gmail.com
 executables: []
@@ -73,6 +87,7 @@ files:
 - lib/data_steroid/properties.rb
 - lib/data_steroid/timestamps.rb
 - lib/data_steroid/validatable.rb
+- lib/data_steroid/version.rb
 homepage: http://github.com/b2beauty/data_steroid
 licenses:
 - MIT