opium 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5e7b88ef5afc4f4bb9899031776ef2947c8043c
-  data.tar.gz: 6d53e858f5ebfc9b448e7a9d98344ca4b2c30fc9
+  metadata.gz: 13bf8b7b6c86a85e42ef4efd054179cd07ec22d9
+  data.tar.gz: 328524b3e01c8ade53ffa6a2e8d7d306dc3b90f8
 SHA512:
-  metadata.gz: 85938d9d4858f607cc93c87b4f212cef1e5812f1bce17b6fc9a18b9f268dc50755ea3f24375ed07dc5e038a96bcb99c79198698a0e09b6da0fa21d6f074f6b14
-  data.tar.gz: 25eec023d9656b0a965da55b39c101a1b3fc551e419784cee75798bd07cb77809b0037dbbf262b3e418fa817415560951ce276fe2426e5fa4fee5660fd1c4ace
+  metadata.gz: a950bcccc7f3d52d077f983701dc15c5e93136fe9682022f79a40953efb1f0f968ee827834983b1d6e75324c49d865e69bdbf8426e388a700da62301b9c2ac82
+  data.tar.gz: 10f6b86273cf753b873a667b31b3f30993682a177fb6ed121b0f1e8aa80156ac8dd07494db380099288c965c09c0ad8bd094806e7bab3bb8640c7489b3b14c45

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.8
+### Resolved Issues
+- #41: Boolean and GeoPoint are now namespaced within Opium. The ModelGenerator also maps attribute types for these classes.
+- #42: GeoPoint now is capable of converting from String in `.to_ruby`
+
 ## 1.1.7
 ### Resolved Issues
 - #40: `Opium::File.to_ruby` now correctly handles JSON string representation of hashes.

data/lib/generators/opium/model_generator.rb

@@ -9,6 +9,10 @@ module Rails
           'DateTime'
         when 'file'
           'Opium::File'
+        when 'geopoint', 'geo_point'
+          'Opium::GeoPoint'
+        when 'boolean', 'bool'
+          'Opium::Boolean'
         else
           type.to_s.camelcase
         end

data/lib/opium/extensions/array.rb

@@ -4,7 +4,7 @@ class Array
   end
   
   def to_geo_point
-    return GeoPoint.new(self) if self.size == 2
+    return Opium::GeoPoint.new(self) if self.size == 2
     fail ArgumentError, %(invalid value for GeoPoint: "#{ self.inspect }"), caller
   end
 end

data/lib/opium/extensions/boolean.rb

@@ -1,4 +1,4 @@
-module Boolean
+module Opium::Boolean
   extend ActiveSupport::Concern
 
   module ClassMethods

data/lib/opium/extensions/false_class.rb

@@ -1,5 +1,5 @@
 class FalseClass
-  include Boolean
+  include Opium::Boolean
   
   def to_bool
     self

data/lib/opium/extensions/geo_point.rb

@@ -1,37 +1,41 @@
-class GeoPoint
-  def initialize( value )
-    self.latitude, self.longitude = *
-      case value
-      when Hash
-        [value[:latitude] || value['latitude'], value[:longitude] || value['longitude']]
-      when Array
-        [value.first, value.last]
-      else
-        raise ArgumentError.new( "invalid value for GeoPoint: \"#{value}\"" )
-      end
-  end
+module Opium
+  class GeoPoint
+    def initialize( value )
+      self.latitude, self.longitude = *
+        case value
+        when Hash
+          [value[:latitude] || value['latitude'], value[:longitude] || value['longitude']]
+        when Array
+          [value.first, value.last]
+        when /^[+-]?\d+(\.\d+)?\s*,\s*[+-]?\d+(\.\d+)?$/
+          value.split(',').map {|c| c.to_f}
+        else
+          raise ArgumentError.new( "invalid value for GeoPoint: \"#{ value }\"" )
+        end
+    end
   
-  attr_accessor :latitude, :longitude
+    attr_accessor :latitude, :longitude
   
-  def to_geo_point
-    self
-  end
+    def to_geo_point
+      self
+    end
   
-  def to_parse
-    { "__type" => "GeoPoint", "latitude" => self.latitude, "longitude" => self.longitude }
-  end
+    def to_parse
+      { "__type" => "GeoPoint", "latitude" => self.latitude, "longitude" => self.longitude }
+    end
   
-  def to_s
-    "#{self.latitude},#{self.longitude}"
-  end
-
-  class << self
-    def to_ruby(object)
-      object.to_geo_point unless object.nil?
+    def to_s
+      "#{ self.latitude },#{ self.longitude }"
     end
+
+    class << self
+      def to_ruby(object)
+        object.to_geo_point unless object.nil?
+      end
     
-    def to_parse(object)
-      object.to_geo_point.to_parse
+      def to_parse(object)
+        object.to_geo_point.to_parse
+      end
     end
   end
 end

data/lib/opium/extensions/hash.rb

@@ -1,6 +1,6 @@
 class Hash
   def to_geo_point
-    return GeoPoint.new(self) if [:latitude, :longitude].all? {|required| self.key? required}
+    return Opium::GeoPoint.new(self) if [:latitude, :longitude].all? {|required| self.key? required}
     raise ArgumentError.new( "invalid value for GeoPoint: \"#{self}\"" )
   end
   

data/lib/opium/extensions/string.rb

@@ -6,8 +6,7 @@ class ::String
   end
   
   def to_geo_point
-    return GeoPoint.new( self.split(',').map {|c| c.to_f} ) if self =~ /^[+-]?\d+(\.\d+)?\s*,\s*[+-]?\d+(\.\d+)?$/
-    raise ArgumentError.new("invalid value for GeoPoint: \"#{self}\"")
+    Opium::GeoPoint.new( self )
   end
   
   class << self

data/lib/opium/extensions/true_class.rb

@@ -1,5 +1,5 @@
 class TrueClass
-  include Boolean
+  include Opium::Boolean
   
   def to_bool
     self

data/lib/opium/version.rb

@@ -1,3 +1,3 @@
 module Opium
-  VERSION = "1.1.7"
+  VERSION = "1.1.8"
 end

data/spec/opium/extensions/array_spec.rb

@@ -5,7 +5,7 @@ describe Array do
   
   describe 'instance' do
     describe ':to_parse' do
-      subject { [GeoPoint.new( latitude: 33.33, longitude: -117.117 )] }
+      subject { [Opium::GeoPoint.new( latitude: 33.33, longitude: -117.117 )] }
       
       it 'should call :to_parse on each element' do
         subject.to_parse.tap do |result|
@@ -18,7 +18,7 @@ describe Array do
       describe 'with two values' do
         subject { [33.33, -117.117] }
       
-        it { subject.to_geo_point.should be_a_kind_of(GeoPoint) }
+        it { subject.to_geo_point.should be_a_kind_of( Opium::GeoPoint ) }
         it 'should have the expected latitude and longitude' do
           subject.to_geo_point.latitude.should == 33.33
           subject.to_geo_point.longitude.should == -117.117

data/spec/opium/extensions/boolean_spec.rb

@@ -1,26 +1,40 @@
 require 'spec_helper'
 
-describe Boolean do
-  subject { Boolean }
-  it { should respond_to(:to_ruby).with(1).argument }
-  it { should respond_to(:to_parse).with(1).argument }
+describe Opium::Boolean do
+  subject { Opium::Boolean }
   
-  it ":to_ruby(object) should convert object to a boolean" do
-    ["true", "false", true, false, 1.0, 1, 0.0, 0].each do |value|
-      subject.to_ruby(value).should be_a_kind_of(Boolean)
-      subject.to_ruby(value).should == value.to_bool
+  it { is_expected.to respond_to( :to_ruby, :to_parse ).with( 1 ).argument }
+  
+  describe '.to_ruby' do
+    let(:result) { subject.to_ruby( convert_from ) }
+    
+    context 'with valid boolean objects' do
+      ["true", "false", true, false, 1.0, 1, 0.0, 0].each do |value|
+        let(:convert_from) { value }
+        
+        it { expect { result }.to_not raise_exception }
+        it { expect( result ).to be_a described_class }
+        it { expect( result ).to eq convert_from.to_bool }
+      end
     end
   end
   
-  it ":to_parse(object) should convert object to a boolean" do
-    ["true", "false", true, false, 1.0, 1, 0.0, 0].each do |value|
-      subject.to_parse(value).should be_a_kind_of(Boolean)
-      subject.to_parse(value).should == value.to_bool
+  describe '.to_parse' do
+    let(:result) { subject.to_parse( convert_from ) }
+    
+    context 'with valid boolean objects' do
+      ["true", "false", true, false, 1.0, 1, 0.0, 0].each do |value|
+        let(:convert_from) { value }
+        
+        it { expect { result }.to_not raise_exception }
+        it { expect( result ).to be_a described_class }
+        it { expect( result ).to eq convert_from.to_bool }
+      end
     end
   end
   
   describe "instance" do
-    subject { Class.new { include Boolean }.new }
+    subject { Class.new { include Opium::Boolean }.new }
     it { should respond_to(:to_ruby, :to_parse).with(0).arguments }
     its(:to_ruby) { should == subject }
     its(:to_parse) { should == subject }

data/spec/opium/extensions/geo_point_spec.rb

@@ -1,35 +1,76 @@
 require 'spec_helper'
 
-describe GeoPoint do
-  subject { GeoPoint }
+describe Opium::GeoPoint do
+  subject { described_class }
   
-  it { should respond_to(:to_ruby, :to_parse).with(1).argument }
+  it { is_expected.to respond_to( :to_ruby, :to_parse ).with( 1 ).argument }
   
-  it ":to_ruby(object) should create a GeoPoint" do
-    [ "33.33, -117.117", {latitude: 33.33, longitude: -117.117}, [33.33, -117.117], GeoPoint.new( [33.33, -117.117] ) ].each do |value|
-      result = subject.to_ruby( value )
-      result.should be_a_kind_of(GeoPoint)
-      result.latitude.should == 33.33
-      result.longitude.should == -117.117
+  describe '.to_ruby' do
+    let(:result) { subject.to_ruby( convert_from ) }
+    
+    context 'with valid object representations' do
+      [ "33.33, -117.117", {latitude: 33.33, longitude: -117.117}, [33.33, -117.117], described_class.new( [33.33, -117.117] ) ].each do |value|
+        let(:convert_from) { value }
+        it { expect { result }.to_not raise_exception }
+        it { expect( result ).to be_a described_class }
+        it( 'sets the proper latitude' ) { expect( result.latitude ).to eq 33.33 }
+        it( 'sets the proper longitude' ) { expect( result.longitude ).to eq -117.117 }
+      end
+    end
+    
+    context 'with invalid object representations' do
+      [ "malformed", {latitude: 0, bad_key: :unknown}, [0], 1, 1.0, true, false ].each do |value|
+        let(:convert_from) { value }
+        it { expect { subject.to_ruby( value ) }.to raise_exception }
+      end      
     end
   end
   
-  it ":to_ruby(bad_data) should raise exception" do
-    [ "malformed", {latitude: 0, bad_key: :unknown}, [0], 1, 1.0, true, false ].each do |value|
-      expect { subject.to_ruby( value ) }.to raise_exception
+  describe '.to_parse' do
+    let(:result) { subject.to_parse( convert_from ) }
+    let(:expected) { { "__type" => "GeoPoint", "latitude" => 33.33, "longitude" => -117.117 } }
+    
+    context 'with valid object representations' do
+      [ "33.33, -117.117", {latitude: 33.33, longitude: -117.117}, [33.33, -117.117], described_class.new( [33.33, -117.117] ) ].each do |value|
+        let(:convert_from) { value }
+        
+        it { expect { result }.to_not raise_exception }
+        it { expect( result ).to eq expected }
+      end    
     end
   end
   
-  it ":to_parse(object) should ensure a geo_point and make into parse object" do
-    [ "33.33, -117.117", {latitude: 33.33, longitude: -117.117}, [33.33, -117.117], GeoPoint.new( [33.33, -117.117] ) ].each do |value|
-      result = subject.to_parse( value )
-      result.should == { "__type" => "GeoPoint", "latitude" => 33.33, "longitude" => -117.117 }
-    end    
+  describe '#initialize' do
+    let(:result) { described_class.new( initialize_from ) }
+    
+    context 'with an array value' do
+      let(:initialize_from) { [ 33.33, -117.117 ] }
+      
+      it { expect { result }.to_not raise_exception }
+    end
+    
+    context 'with a hash value' do
+      let(:initialize_from) { { latitude: 33.33, longitude: -117.117 } }
+      
+      it { expect { result }.to_not raise_exception }
+    end
+    
+    context 'with a string value' do
+      let(:initialize_from) { "33.33, -117.117" }
+      
+      it { expect { result }.to_not raise_exception }
+    end
+    
+    context 'with anything else' do
+      let(:initialize_from) { 42 }
+      
+      it { expect { result }.to raise_exception }
+    end
   end
   
   describe "instance" do
     describe "with an array value" do
-      subject { GeoPoint.new [33.33, -117.117] }
+      subject { described_class.new [33.33, -117.117] }
       it { should respond_to(:latitude, :longitude, :to_geo_point, :to_parse).with(0).arguments }
       it { should respond_to(:latitude=, :longitude=).with(1).argument }
     
@@ -41,7 +82,7 @@ describe GeoPoint do
     end
 
     describe "with a hash value" do
-      subject { GeoPoint.new latitude: 33.33, longitude: -117.117 }
+      subject { described_class.new latitude: 33.33, longitude: -117.117 }
       it { should respond_to(:latitude, :longitude, :to_geo_point, :to_parse).with(0).arguments }
       it { should respond_to(:latitude=, :longitude=).with(1).argument }
 

data/spec/opium/extensions/hash_spec.rb

@@ -5,7 +5,7 @@ describe Hash do
   
   describe "instance" do
     describe ":to_parse" do
-      subject { { 'foo' => GeoPoint.new( latitude: 33.33, longitude: -117.117 ) } }
+      subject { { 'foo' => Opium::GeoPoint.new( latitude: 33.33, longitude: -117.117 ) } }
       
       it 'should return a new hash, with :to_parse called on each value' do
         subject.to_parse.tap do |result|
@@ -18,7 +18,7 @@ describe Hash do
       describe ":to_geo_point" do
         subject { { latitude: 33.33, longitude: -117.117 } }
       
-        it { subject.to_geo_point.should be_a_kind_of(GeoPoint) }
+        it { subject.to_geo_point.should be_a_kind_of( Opium::GeoPoint ) }
         it "should have the expected latitude and longitude" do
           subject.to_geo_point.latitude.should == 33.33
           subject.to_geo_point.longitude.should == -117.117

data/spec/opium/extensions/string_spec.rb

@@ -35,14 +35,14 @@ describe String do
     
     it "should be able to convert various values to true" do
       %w[true t yes y 1].each do |value|
-        value.to_bool.should be_a_kind_of( Boolean )
+        value.to_bool.should be_a_kind_of( Opium::Boolean )
         value.to_bool.should == true
       end
     end
     
     it "should be able to convert various values to false" do
       [""] + %w[false f no n 0].each do |value|
-        value.to_bool.should be_a_kind_of( Boolean )
+        value.to_bool.should be_a_kind_of( Opium::Boolean )
         value.to_bool.should == false
       end
     end
@@ -53,7 +53,7 @@ describe String do
     
     it ":to_geo_point should be able to convert a 'lat, lng' value" do
       result = "33.33, -117.117".to_geo_point
-      result.should be_a_kind_of(GeoPoint)
+      result.should be_a_kind_of( Opium::GeoPoint )
       result.latitude.should == 33.33
       result.longitude.should == -117.117
     end

data/spec/opium/model_spec.rb

@@ -6,7 +6,7 @@ describe Opium::Model do
       include Opium::Model
       field :name, type: String
       field :occurred_at, type: DateTime
-      field :severe, type: Boolean
+      field :severe, type: Opium::Boolean
     end )
   end
   

data/spec/opium/user_spec.rb

@@ -197,7 +197,7 @@ describe Opium::User do
   context 'within a subclass' do
     before do
       stub_const( 'SpecialUser', Class.new(Opium::User) do
-        field :has_web_access, type: Boolean
+        field :has_web_access, type: Opium::Boolean
       end )
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opium
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Joshua Bowers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler