motion-support 0.2.6 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d6bd52ad26c40a4b8f4a38e2e1f1dd86cb30b5a4
+  data.tar.gz: 278c0956ae07db17b8ac6cd905a85c98ecdd497f
+SHA512:
+  metadata.gz: da57f98259563e1bcc7d3f1966a096149565f39ecd2dea875c3a8172334b9ddd84b6c82ded42a5837ebd435d4290b5c60384433b50249c2c6e1959336427649e
+  data.tar.gz: 76836035e618fc9cc54840e5313a1f763cf32aa861b54699d2b993120b692a0b35d4c88664dc384aa34b664b3cde045ec4ff5dc2c3fa9ca2e6135d02a6d7d421

data/.travis.yml

@@ -0,0 +1,11 @@
+language: objective-c
+osx_image: xcode7.1
+script: bundle exec rake spec
+deploy:
+  provider: rubygems
+  api_key:
+    secure: BA4jK37Z5iul3szro9p1YP7MScgbQ9ITEiJD01FBjQGBPXWteomYD9NF0dV0aDk+RHAQEogoX5Ubkmt8MKlo/72nosMGR56n+IbNkmcdpsykg8Bb62e/ZuYpnu7OvK3M9cgeq+HskHsRPQWoDoM5GnkNHMfx7ecp1a1bJ8eP614=
+  gem: motion-support
+  on:
+    tags: true
+    repo: rubymotion/motion-support

data/README.md

@@ -1,4 +1,7 @@
 # MotionSupport
+[![Build Status](https://travis-ci.org/rubymotion/motion-support.svg?branch=master)](https://travis-ci.org/rubymotion/motion-support)
+[![Gem Version](https://img.shields.io/gem/v/motion-support.svg)](https://rubygems.org/gems/motion-support)
+[![MIT Licensed](https://img.shields.io/github/license/rubymotion/motion-support.svg)](https://github.com/rubymotion/motion-support/blob/master/LICENSE)
 
 This is a port of the parts of ActiveSupport that make sense for RubyMotion.
 
@@ -20,7 +23,7 @@ gem 'motion-support'
 
 # API docs
 
-[Are here](http://www.rubydoc.info/github/tkadauke/motion-support/master/frames).
+[Are here](http://www.rubydoc.info/github/rubymotion/motion-support/master).
 
 # Partial loading
 
@@ -170,7 +173,7 @@ module Mod
   mattr_accessor :foo, :bar
   attr_internal :baz
   delegate :boo, :to => :foo
-  
+
   remove_method :baz
 end
 ```
@@ -304,7 +307,6 @@ Specifically:
 * String inquiry methods are missing
 * String multibyte methods are missing
 * `String#html_safe` and `ERB` extensions are not needed in RubyMotion
-* `Object#to_json` and subclasses are missing
 * `Range#to_s(:db)` was removed
 * The `rfc822` time format was removed, since it relies on time zone support.
 * Extensions to `LoadError` and `NameError` were removed
@@ -317,7 +319,6 @@ Specifically:
 Things to do / to decide:
 
 * RubyMotion lacks a `Date` class. in `_stdlib` there is a stub of a Date class that makes the `Date` extensions work. This stub needs to be completed.
-* Implement `Object#to_json`, probably best if implemented on top of Cocoa APIs
 * Implement `Object#to_xml`
 * Implement `Hash#from_xml`
 * Do we need `Hash#extractable_options?`?
@@ -344,12 +345,6 @@ Things to do / to decide:
 
 ActiveSupport was originally written as part of Ruby on Rails by David Heinemeier Hansson. Over the years, countless contributors made many additions. They made this library possible.
 
-# License
-
-MotionSupport is released under the MIT license:
-
-<http://www.opensource.org/licenses/MIT>
-
 # Forking
 
 Feel free to fork and submit pull requests!

data/lib/motion-support.rb

@@ -1,5 +1,3 @@
 require 'motion-require'
 
 Motion::Require.all(Dir.glob(File.expand_path('../../motion/**/*.rb', __FILE__)))
-
-at_exit { puts "\nWARNING: Automatic dependency detection does not work with motion-support. Turn it off in your Rakefile:\n\n  app.detect_dependencies = false\n\n" if Motion::Project::App.config.detect_dependencies }

data/motion/core_ext/ns_dictionary.rb

@@ -7,5 +7,8 @@ class NSDictionary
     end
   end
   
-  delegate :symbolize_keys, :with_indifferent_access, :nested_under_indifferent_access, :to => :to_hash
+  delegate :symbolize_keys, :symbolize_keys!, :deep_symbolize_keys, :deep_symbolize_keys!,
+    :stringify_keys, :stringify_keys!, :deep_stringify_keys!, :deep_stringify_keys,
+    :deep_transform_keys, :deep_transform_keys!,
+    :with_indifferent_access, :nested_under_indifferent_access, :to => :to_hash
 end

data/motion/core_ext/numeric/conversions.rb

@@ -40,10 +40,4 @@ class Numeric
       end
     end
   end
-
-  # Stub method to return a pseudo-JSON value from a number. It just returns a string by calling to_s.
-  # This should work most of the time.
-  def to_json
-    to_s
-  end
 end

data/motion/core_ext/object/to_json.rb

@@ -0,0 +1,126 @@
+# encoding: utf-8
+
+class Object
+  # Serializes the object to a hash then the hash using Cocoa's NSJSONSerialization
+  def to_json
+    attributes = {}
+
+    self.instance_variables.each do |attribute|
+      key = attribute.to_s.gsub('@', '')
+      attributes[key] = self.instance_variable_get(attribute)
+    end
+
+    attributes.to_json
+  end
+end
+
+class NilClass
+  # Returns 'null'.
+  def to_json
+    'null'
+  end
+end
+
+class TrueClass
+  # Returns +self+ as string.
+  def to_json
+    self.to_s
+  end
+end
+
+class FalseClass
+  # Returns +self+ as string.
+  def to_json
+    self.to_s
+  end
+end
+
+class JSONString
+  # JSON escape characters
+  class << self
+    ESCAPED_CHARS = {
+      "\u0000" => '\u0000', "\u0001" => '\u0001',
+      "\u0002" => '\u0002', "\u0003" => '\u0003',
+      "\u0004" => '\u0004', "\u0005" => '\u0005',
+      "\u0006" => '\u0006', "\u0007" => '\u0007',
+      "\u0008" => '\b',     "\u0009" => '\t',
+      "\u000A" => '\n',     "\u000B" => '\u000B',
+      "\u000C" => '\f',     "\u000D" => '\r',
+      "\u000E" => '\u000E', "\u000F" => '\u000F',
+      "\u0010" => '\u0010', "\u0011" => '\u0011',
+      "\u0012" => '\u0012', "\u0013" => '\u0013',
+      "\u0014" => '\u0014', "\u0015" => '\u0015',
+      "\u0016" => '\u0016', "\u0017" => '\u0017',
+      "\u0018" => '\u0018', "\u0019" => '\u0019',
+      "\u001A" => '\u001A', "\u001B" => '\u001B',
+      "\u001C" => '\u001C', "\u001D" => '\u001D',
+      "\u001E" => '\u001E', "\u001F" => '\u001F',
+      "\u2028" => '\u2028', "\u2029" => '\u2029',
+      '"'  => '\"',
+      '\\' => '\\\\',
+      '>' => '\u003E',
+      '<' => '\u003C',
+      '&' => '\u0026'}
+
+    ESCAPE_REGEX = /[\u0000-\u001F\u2028\u2029"\\><&]/u
+
+    def escape(string)
+      %("#{string.gsub ESCAPE_REGEX, ESCAPED_CHARS}")
+    end
+  end
+end
+
+class String
+  # Returns JSON-escaped +self+.
+  def to_json
+    JSONString.escape self
+  end
+end
+
+class Symbol
+  # Returns +self+ as string.
+  def to_json
+    self.to_s
+  end
+end
+
+class Numeric
+  # Returns +self+.
+  def to_json
+    self
+  end
+end
+
+# For more complex objects (Array/Hash):
+# Convert an object into a "JSON-ready" representation composed of
+# primitives like Hash, Array, String, Numeric, and true/false/nil.
+# Recursively calls #as_json to the object to recursively build a
+# fully JSON-ready object.
+#
+# This allows developers to implement #as_json without having to
+# worry about what base types of objects they are allowed to return
+# or having to remember to call #as_json recursively.
+
+class Array
+  def as_json
+    map { |v| (v.respond_to?(:as_json) ? v.as_json : v) }
+  end
+
+  # Calls <tt>as_json</tt> on all its elements and converts to a string.
+  def to_json
+    NSJSONSerialization.dataWithJSONObject(as_json, options: 0, error: nil).to_s
+  end
+end
+
+class Hash
+  # Ensure there are valid keys/values
+  def as_json
+    Hash[map { |k,v| [k.to_s, (v.respond_to?(:as_json) ? v.as_json : v)] }]
+  end
+
+  # Serializes the hash object using Cocoa's NSJSONSerialization
+  def to_json
+    # JSON keys must be strings, and any sub-objects also serialized
+    NSJSONSerialization.dataWithJSONObject(as_json, options: 0, error: nil).to_s
+  end
+end

data/motion/version.rb

@@ -1,3 +1,3 @@
 module MotionSupport
-  VERSION = "0.2.6"
+  VERSION = "0.3.0"
 end

data/spec/motion-support/core_ext/object/to_json_spec.rb

@@ -0,0 +1,59 @@
+describe ".to_json" do
+  describe "object" do
+    it "should serialize attributes" do
+      foo = Object.new
+      class << foo
+        attr_accessor :test
+      end
+      foo.test = 'bar'
+
+      foo.to_json.should == '{"test":"bar"}'
+    end
+  end
+
+  describe "nil" do
+    it "should return null" do
+      nil.to_json.should == 'null'
+    end
+  end
+
+  describe "true, false" do
+    it "should return self as string" do
+      true.to_json.should == 'true'
+      false.to_json.should == 'false'
+    end
+  end
+
+  describe "string" do
+    it "should escape the required characters" do
+      'A string with special \ " &'.to_json.should == "\"A string with special \\\\ \\\" \\u0026\""
+    end
+  end
+
+  describe "numeric" do
+    it "should return self" do
+      2.days.to_json.should == 172800
+    end
+  end
+
+  describe "array" do
+    it "should convert mixed type array" do
+      [true, false, nil, {:foo => :bar}, 'fizz', ''].to_json.should == '[true,false,null,{"foo":"bar"},"fizz",""]'
+    end
+  end
+
+  describe "hash" do
+    it "should convert a string hash" do
+      {}.to_json.should == '{}'
+      { :hello => :world }.to_json.should == '{"hello":"world"}'
+      { :hello => "world" }.to_json.should == '{"hello":"world"}'
+      { "hello" => 10 }.to_json.should == '{"hello":10}'
+      { "hello" => { "world" => "hi" } }.to_json.should == '{"hello":{"world":"hi"}}'
+      {:hello => "world", "say_bye" => true}.to_json.should == '{"hello":"world","say_bye":true}'
+    end
+
+    it "should convert a number hash" do
+      {10 => 20, 30 => 40, 50 => 60}.to_json.should == '{"10":20,"30":40,"50":60}'
+    end
+  end
+end

data/spec/motion-support/duration_spec.rb

@@ -3,30 +3,30 @@ describe "Duration" do
     it "should be a day" do
       MotionSupport::Duration.should === 1.day
     end
-    
+
     it "should not be an int" do
       MotionSupport::Duration.should.not === 1.day.to_i
     end
-    
+
     it "should not be a string" do
       MotionSupport::Duration.should.not === 'foo'
     end
   end
-  
+
   describe "equals" do
     it "should equal itself" do
       1.day.should == 1.day
     end
-    
+
     it "should equal integer representation" do
       1.day.should == 1.day.to_i
     end
-    
+
     it "should not equal string" do
       1.day.should.not == 'foo'
     end
   end
-  
+
   describe "inspect" do
     it "should convert to string representation" do
       0.seconds.inspect.should == '0 seconds'
@@ -39,7 +39,7 @@ describe "Duration" do
       1.fortnight.inspect.should == '14 days'
     end
   end
-  
+
   describe "arithmetic" do
     it "should not break when subtracting time from itself" do
       lambda { Date.today - Date.today }.should.not.raise
@@ -52,45 +52,45 @@ describe "Duration" do
     def test_plus_with_time
       assert_equal 1 + 1.second, 1.second + 1, "Duration + Numeric should == Numeric + Duration"
     end
-    
+
   end
-  
+
   describe "fractions" do
     describe "days" do
       it "should support fractional days" do
         1.5.weeks.should == (86400 * 7) * 1.5
         1.7.weeks.should == (86400 * 7) * 1.7
       end
-      
+
       it "should support since" do
         t = 2.years.ago
         1.5.days.since(t).should == 36.hours.since(t)
       end
-      
+
       it "should support ago" do
         t = 2.years.ago
         1.5.days.ago(t).should == 36.hours.ago(t)
       end
     end
-    
+
     describe "weeks" do
       it "should support fractional weeks" do
         1.5.days.should == 86400 * 1.5
         1.7.days.should == 86400 * 1.7
       end
-      
+
       it "should support since" do
         t = 2.years.ago
         1.5.weeks.since(t).should == (7 * 36).hours.since(t)
       end
-      
+
       it "should support ago" do
         t = 2.years.ago
         1.5.weeks.ago(t).should == (7 * 36).hours.ago(t)
       end
     end
   end
-  
+
   describe "delegation" do
     it "should delegate with block" do
       counter = 0
@@ -98,10 +98,4 @@ describe "Duration" do
       counter.should == 60
     end
   end
-  
-  describe "to_json" do
-    it "should convert to json" do
-      2.days.to_json.should == '172800'
-    end
-  end
 end

data/spec/motion-support/ns_dictionary_spec.rb

@@ -18,15 +18,51 @@ describe "NSDictionary" do
       @hash.values.should == ['bar']
     end
   end
-  
-  describe "symbolize_keys" do
-    it "should work for NSDictionary instances" do
-      dict = NSMutableDictionary.alloc.init
-      dict.setValue('bar', forKey:'foo')
-      dict.symbolize_keys.should == { :foo => 'bar' }
+
+  def describe_with_bang(method, &block)
+    bang_method = "#{method}!"
+
+    describe(method) do
+      it "should work for NSDictionary instances" do
+        block.call(method)
+      end
+    end
+
+    describe(bang_method) do
+      it "should work for NSDictionary instances" do
+        block.call(bang_method)
+      end
     end
   end
 
+  describe_with_bang "symbolize_keys" do |method|
+    dict = NSMutableDictionary.alloc.init
+    dict.setValue('bar', forKey:'foo')
+    dict.send(method).should == { :foo => 'bar' }
+  end
+
+  describe_with_bang "deep_symbolize_keys" do |method|
+    dict = NSMutableDictionary.alloc.init
+    innerDict = NSMutableDictionary.alloc.init
+    innerDict.setValue('foobar', forKey: 'bar')
+    dict.setValue(innerDict, forKey:'foo')
+    dict.send(method).should == {foo: {bar: 'foobar'}}
+  end
+
+  describe_with_bang "stringify_keys" do |method|
+    dict = NSMutableDictionary.alloc.init
+    dict.setValue('bar', forKey: :foo)
+    dict.send(method).should == {'foo' => 'bar'}
+  end
+
+  describe_with_bang "deep_stringify_keys" do |method|
+    dict = NSMutableDictionary.alloc.init
+    innerDict = NSMutableDictionary.alloc.init
+    innerDict.setValue('foobar', forKey: :bar)
+    dict.setValue(innerDict, forKey: :foo)
+    dict.send(method).should == {'foo' => {'bar' => 'foobar'}}
+  end
+
   describe "with_indifferent_access" do
     it "should work for NSDictionary instances" do
       dict = NSMutableDictionary.alloc.init

metadata

@@ -1,54 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: motion-support
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.2.6
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Thomas Kadauke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-12-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-11-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: motion-require
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-description: Commonly useful extensions to the standard library for RubyMotion. Ported from ActiveSupport.
-email: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Commonly useful extensions to the standard library for RubyMotion. Ported
+  from ActiveSupport.
+email:
 - thomas.kadauke@googlemail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - .yardopts
 - Gemfile
 - HACKS.md
-- MIT-LICENSE
+- LICENSE
 - README.md
 - Rakefile
 - app/app_delegate.rb
@@ -129,6 +132,7 @@ files:
 - motion/core_ext/object/duplicable.rb
 - motion/core_ext/object/inclusion.rb
 - motion/core_ext/object/instance_variables.rb
+- motion/core_ext/object/to_json.rb
 - motion/core_ext/object/to_param.rb
 - motion/core_ext/object/to_query.rb
 - motion/core_ext/object/try.rb
@@ -199,6 +203,7 @@ files:
 - spec/motion-support/core_ext/object/duplicable_spec.rb
 - spec/motion-support/core_ext/object/inclusion_spec.rb
 - spec/motion-support/core_ext/object/instance_variable_spec.rb
+- spec/motion-support/core_ext/object/to_json_spec.rb
 - spec/motion-support/core_ext/object/to_param_spec.rb
 - spec/motion-support/core_ext/object/to_query_spec.rb
 - spec/motion-support/core_ext/object/try_spec.rb
@@ -226,38 +231,28 @@ files:
 - spec/motion-support/number_helper_spec.rb
 homepage: https://github.com/tkadauke/motion-support
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1590752612782680441
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1590752612782680441
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Commonly useful extensions to the standard library for RubyMotion
-test_files: 
+test_files:
 - spec/motion-support/_helpers/constantize_test_cases.rb
 - spec/motion-support/_helpers/inflector_test_cases.rb
 - spec/motion-support/callback_spec.rb
@@ -302,6 +297,7 @@ test_files:
 - spec/motion-support/core_ext/object/duplicable_spec.rb
 - spec/motion-support/core_ext/object/inclusion_spec.rb
 - spec/motion-support/core_ext/object/instance_variable_spec.rb
+- spec/motion-support/core_ext/object/to_json_spec.rb
 - spec/motion-support/core_ext/object/to_param_spec.rb
 - spec/motion-support/core_ext/object/to_query_spec.rb
 - spec/motion-support/core_ext/object/try_spec.rb