hashme 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2c83753729924cb8ce0b33b18cae286f361d976
-  data.tar.gz: a9e0c44b939e0dca840d64fa1cdd91ad2850e517
+  metadata.gz: 6f50c8f90a959db106926caadbdaee800ed55073
+  data.tar.gz: 422d08c967c35172445489d6716b1a799f53b299
 SHA512:
-  metadata.gz: 3648a068f2c367ef54172a04e49f3991bd042d087b1288bb99becf3fe2daa87f9f933f0bf1aa9d2a149fa3b8576ca2ab7727144590834dbeaad0743599f47f78
-  data.tar.gz: 8b05b8582dc6ebb5c4167901906eaa0abbbeb5021dbec4ca48fbaa1fb8a81b3852aa24e008c7102e715acefcbb24bf9d25b96479407f469a9e9b6aa0d30f2b79
+  metadata.gz: 417b46455a892130eb7e4b8781dccfa7530ac10cf93d656863c78d3ebc5b59a2f81b8378acc9736944bd25062f37c65eb475ce8522b8af961b888802300318dd
+  data.tar.gz: 0c8c5cd1b21333070e76c6e74f9c40095c4f48117086a72be98f61db7a0201f79cfb83ac5c3468e8ebaf6bf5d52e093bc5bb88671af8a08c737bd72b8feba15b

data/.gitignore

@@ -4,7 +4,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
+*.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -0,0 +1,24 @@
+language: ruby
+gemfile:
+  - Gemfile.activemodel-4.x
+  - Gemfile.activemodel-5.x
+rvm:
+  - 2.0.0
+  - 2.1.10
+  - 2.2.4
+  - 2.3.0
+  - jruby
+  - rbx
+before_install:
+  - gem install bundler
+env:
+  - JRUBY_OPTS=--2.0
+matrix:
+  allow_failures:
+    - rvm: rbx # Sorry, don't have time for these failures!
+    - rvm: 2.0.0
+      gemfile: Gemfile.activemodel-5.x
+    - rvm: 2.1.10
+      gemfile: Gemfile.activemodel-5.x
+    - rvm: jruby
+      gemfile: Gemfile.activemodel-5.x

data/Gemfile.activemodel-4.x

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+gemspec
+
+gem 'activemodel', '~> 4.0'

data/Gemfile.activemodel-5.x

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+gemspec
+
+gem 'activemodel', '~> 5.0'

data/README.md

@@ -1,12 +1,14 @@
 # Hashme
 
+[![Build Status](https://travis-ci.org/samlown/hashme.png)](https://travis-ci.org/samlown/hashme)
+
 Hashes are great, but sometimes you need a bit more structure.
 
 Hashme helps you create simple models that allow you to initialize and
 generate hashes that you can serialize and store as you wish.
 
 Its a bit like ActiveRecord, but without all the messy database stuff,
-and of course you can nest to you're heart's content.
+and of course you can nest models to you're heart's content.
 
 A few situations where you might find Hashme useful:
 
@@ -69,13 +71,13 @@ class Kennel
 end
 
 # Build a kennel
-kennel = Kennel.new(:name => "Goaway Kitty Home", :location => Point.new(40.333,-3.4555))
+kennel = Kennel.new(:name => "Goaway Kitty Home", :location => Point.new(40.333,-3.4555), :cats => [])
 
 # Add a kitten using an object
-kennel << kitty
+kennel.cats << kitty
 
 # Add a new cat using a raw hash
-kennel << {
+kennel.cats << {
   :name => "Felix",
   :description => "Black and white"
 }
@@ -118,6 +120,11 @@ u.errors.first     # [:email, "can't be blank"]
 
 ## History
 
+### 0.2.6 - 2017-09-12
+
+ * Setting ActiveModel minimum to 4.0, adding travis config to test both 4.0 and 5.0. (@samlown)
+ * Adding support for using `Proc` type as default values for properties (@apoloval)
+
 ### 0.2.5 - 2016-06-03 - Again!
 
  * Adding support for deleting attributes by setting them to nil to keep output clean.

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+

data/hashme.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activemodel", ">= 3.0"
+  spec.add_dependency "activemodel", ">= 4.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/hashme/property.rb

@@ -1,7 +1,7 @@
 module Hashme
   class Property
 
-    attr_reader :name, :type, :default, :array
+    attr_reader :name, :type, :array
 
     def initialize(name, type, opts = {})
       @name = name.to_sym
@@ -27,6 +27,11 @@ module Hashme
       name
     end
 
+    def default
+      return @default.call if @default.is_a?(Proc)
+      @default
+    end
+
     # Build a new object of the type defined by the property.
     def build(owner, value)
       if array && value.is_a?(Array)

data/lib/hashme/property_casting.rb

@@ -103,7 +103,7 @@ module Hashme
         typecast_hash_to_date(value)
       elsif value.is_a?(Time) # sometimes people think date is time!
         value.to_date
-      elsif value.to_s =~ /(\d{4})[\-|\/](\d{2})[\-|\/](\d{2})/
+      elsif value.to_s =~ /ˆ(\d{4})[\-|\/](\d{2})[\-|\/](\d{2})$/
         # Faster than parsing the date
         Date.new($1.to_i, $2.to_i, $3.to_i)
       else

data/lib/hashme/version.rb

@@ -1,3 +1,3 @@
 module Hashme
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/hashme/property_casting_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 class Course
   include Hashme
-  
+
   property :title, String
   property :participants, [Object]
   property :ends_at, Time
@@ -507,6 +507,18 @@ describe Hashme::PropertyCasting do
         expect(course.started_on.day).to eql(20)
         expect(course.started_on.year).to eql(2006)
       end
+
+      it 'parses date with wrong formatted year (ensure consider the beginning of string)' do
+        course.started_on = 'abc02016-10-03'
+        expect(course['started_on'].month).to eql(10)
+        expect(course['started_on'].day).to eql(03)
+        expect(course['started_on'].year).to eql(2016)
+      end
+
+      it 'does not typecast wrongly formatted dates (ensure consider the end of string)' do
+        course.started_on = '2016-10-030'
+        expect(course['started_on']).to be_nil
+      end
     end
 
     it 'does not typecast non-date values' do

data/spec/hashme/property_spec.rb

@@ -36,6 +36,11 @@ describe Hashme::Property do
       prop = subject.new(:name, String, :default => "Freddo")
       expect(prop.default).to eql("Freddo")
     end
+
+    it "should accept a default option from a Proc" do
+      prop = subject.new(:name, String, :default => -> { "Freddo" })
+      expect(prop.default).to eql("Freddo")
+    end
   end
 
   describe "#to_s" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashme
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Sam Lown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +75,10 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
+- Gemfile.activemodel-4.x
+- Gemfile.activemodel-5.x
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -117,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Easily define simple models that can be easily serialized and de-serialized.