motion-support 0.2.4 → 0.2.5

data/README.md

@@ -40,6 +40,22 @@ require 'motion-support'
 
 Loads everything.
 
+## callbacks
+
+```ruby
+require 'motion-support/callbacks'
+```
+
+Loads the `MotionSupport::Callbacks` module. It allows you to easily add Rails-style callbacks to any class.
+
+## concern
+
+```ruby
+require 'motion-support/concern'
+```
+
+Loads the `MotionSupport::Concern` module. This simplifies separating classes into modules and managing module dependencies.
+
 ## inflector
 
 ```ruby
@@ -268,6 +284,7 @@ In general:
 * All marshalling code was removed
 * All logging code was removed
 * All extensions to `Test::Unit` were removed
+* The `ActiveSupport` namespace is called `MotionSupport`
 
 Specifically:
 
@@ -292,6 +309,10 @@ Specifically:
 * The `rfc822` time format was removed, since it relies on time zone support.
 * Extensions to `LoadError` and `NameError` were removed
 * The `ThreadSafe` versions of `Hash` and `Array` are just aliases to the standard classes
+* In `MotionSupport::Callbacks` it is not possible to give a string containing Ruby code as a conditions via `:if`, since RubyMotion doesn't support `eval`.
+* In `MotionSupport::Callbacks`, if a proc is given as a condition to `:if`, the block must take the class instance as a parameter. `self` is not automatically set.
+* In `MotionSupport::Callbacks#define_callbacks`, the `:terminator` argument must take a block of the form `lambda { |result| }` where `result` is the intermediate result from the callback methods.
+* `NumberHelper` and numeric conversions only support phone numbers for now
 
 Things to do / to decide:
 
@@ -314,8 +335,6 @@ Things to do / to decide:
 * Do we need multibyte string handling extensions? AFAIK, all strings in RubyMotion are UTF-8. Is that true?
 * Do we need `Struct#to_h`?
 * Implement extensions to class `Thread` if they make sense.
-* Port callbacks.rb
-* Port concern.rb
 * Do we need the `Configurable` module?
 * Do we need the `OrderedOptions` class?
 * Some extensions have to be made available for Cocoa classes (`NSArray`, `NSDictionary` etc.), since we want to effectively handle return values from Objective-C methods (they return Cocoa classes). The way to do this is to write a conversion method from Cocoa class to Ruby class and delegate the extension methods in the Cocoa class to the conversion method. See `motion/core_ext/ns_string.rb` for an example.

data/Rakefile

@@ -1,6 +1,6 @@
 #!/usr/bin/env rake
 $:.unshift("/Library/RubyMotion/lib")
-require 'motion/project'
+require 'motion/project/template/ios'
 require "bundler/gem_tasks"
 Bundler.setup
 Bundler.require

data/examples/Inflector/app/inflector_view_controller.rb

@@ -1,14 +1,3 @@
-class Formotion::Form
-  def row(key)
-    sections.each do |section|
-      section.rows.each do |row|
-        return row if row.key == key
-      end
-    end
-    nil
-  end
-end
-
 class InflectorViewController < Formotion::FormController
   def init
     initWithForm(build_form)

data/lib/motion-support/callbacks.rb

@@ -1,9 +1,11 @@
 require 'motion-require'
 
 files = [
+  "_stdlib/array",
   "concern",
   "descendants_tracker",
-  "callbacks"
+  "callbacks",
+  "core_ext/kernel/singleton_class"
 ].map { |file| File.expand_path(File.join(File.dirname(__FILE__), "/../../motion", "#{file}.rb")) }
 
 Motion::Require.all(files)

data/lib/motion-support/core_ext/numeric.rb

@@ -2,6 +2,7 @@ require 'motion-require'
 
 files = [
   'core_ext/numeric/bytes',
+  'core_ext/numeric/conversions',
   'core_ext/numeric/time'
 ].map { |file| File.expand_path(File.join(File.dirname(__FILE__), "/../../../motion", "#{file}.rb")) }
 

data/lib/motion-support/core_ext/object.rb

@@ -1,6 +1,7 @@
 require 'motion-require'
 
 files = [
+  '_stdlib/cgi',
   'core_ext/object/acts_like',
   'core_ext/object/blank',
   'core_ext/object/deep_dup',

data/motion/_stdlib/date.rb

@@ -74,4 +74,8 @@ class Date
   def to_time
     @value
   end
+
+  def succ
+    self + 1
+  end
 end

data/motion/core_ext/ns_dictionary.rb

@@ -7,5 +7,5 @@ class NSDictionary
     end
   end
   
-  delegate :symbolize_keys, :to => :to_hash
+  delegate :symbolize_keys, :with_indifferent_access, :nested_under_indifferent_access, :to => :to_hash
 end

data/motion/core_ext/numeric/conversions.rb

@@ -1,4 +1,46 @@
 class Numeric
+  # Provides options for converting numbers into formatted strings.
+  # Right now, options are only provided for phone numbers.
+  #
+  # ==== Options
+  #
+  # For details on which formats use which options, see MotionSupport::NumberHelper
+  #
+  # ==== Examples
+  #
+  #  Phone Numbers:
+  #  5551234.to_s(:phone)                                     # => 555-1234
+  #  1235551234.to_s(:phone)                                  # => 123-555-1234
+  #  1235551234.to_s(:phone, area_code: true)                 # => (123) 555-1234
+  #  1235551234.to_s(:phone, delimiter: ' ')                  # => 123 555 1234
+  #  1235551234.to_s(:phone, area_code: true, extension: 555) # => (123) 555-1234 x 555
+  #  1235551234.to_s(:phone, country_code: 1)                 # => +1-123-555-1234
+  #  1235551234.to_s(:phone, country_code: 1, extension: 1343, delimiter: '.')
+  #  # => +1.123.555.1234 x 1343
+  def to_formatted_s(format = :default, options = {})
+    case format
+    when :phone
+      return MotionSupport::NumberHelper.number_to_phone(self, options)
+    else
+      self.to_default_s
+    end
+  end
+
+  [Float, Fixnum, Bignum].each do |klass|
+    klass.send(:alias_method, :to_default_s, :to_s)
+
+    klass.send(:define_method, :to_s) do |*args|
+      if args[0].is_a?(Symbol)
+        format = args[0]
+        options = args[1] || {}
+
+        self.to_formatted_s(format, options)
+      else
+        to_default_s(*args)
+      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

data/motion/core_ext/object/inclusion.rb

@@ -1,7 +1,6 @@
 class Object
   # Returns true if this object is included in the argument(s). Argument must be
-  # any object which responds to +#include?+ or optionally, multiple arguments
-  # can be passed in. Usage:
+  # any object which responds to +#include?+. Usage:
   #
   #   characters = ['Konata', 'Kagami', 'Tsukasa']
   #   'Konata'.in?(characters) # => true

data/motion/logger.rb

@@ -1,12 +1,22 @@
+module Kernel
+  def log(*args)
+    MotionSupport.logger.log(*args)
+  end
+  
+  def l(*args)
+    MotionSupport.logger.log(args.map { |a| a.inspect })
+  end
+end
+
 module MotionSupport
   class NullLogger
-    def log(string)
+    def log(*args)
     end
   end
 
   class StdoutLogger
-    def log(string)
-      puts string
+    def log(*args)
+      puts args
     end
   end
   
@@ -21,9 +31,17 @@ module MotionSupport
       @output_stream.open
     end
     
-    def log(string)
-      data = NSData.alloc.initWithData("#{string}\n".dataUsingEncoding(NSASCIIStringEncoding))
-      @output_stream.write(data.bytes, maxLength:data.length);
+    def log(*args)
+      args.each do |string|
+        data = NSData.alloc.initWithData("#{string}\n".dataUsingEncoding(NSASCIIStringEncoding))
+        @output_stream.write(data.bytes, maxLength:data.length)
+      end
     end
   end
+  
+  mattr_writer :logger
+  
+  def self.logger
+    @logger ||= StdoutLogger.new
+  end
 end

data/motion/number_helper.rb

@@ -0,0 +1,54 @@
+module MotionSupport
+  module NumberHelper
+    extend self
+
+    # Formats a +number+ into a US phone number (e.g., (555)
+    # 123-9876). You can customize the format in the +options+ hash.
+    #
+    # ==== Options
+    #
+    # * <tt>:area_code</tt> - Adds parentheses around the area code.
+    # * <tt>:delimiter</tt> - Specifies the delimiter to use
+    #   (defaults to "-").
+    # * <tt>:extension</tt> - Specifies an extension to add to the
+    #   end of the generated number.
+    # * <tt>:country_code</tt> - Sets the country code for the phone
+    #   number.
+    # ==== Examples
+    #
+    #   number_to_phone(5551234)                                     # => 555-1234
+    #   number_to_phone('5551234')                                   # => 555-1234
+    #   number_to_phone(1235551234)                                  # => 123-555-1234
+    #   number_to_phone(1235551234, area_code: true)                 # => (123) 555-1234
+    #   number_to_phone(1235551234, delimiter: ' ')                  # => 123 555 1234
+    #   number_to_phone(1235551234, area_code: true, extension: 555) # => (123) 555-1234 x 555
+    #   number_to_phone(1235551234, country_code: 1)                 # => +1-123-555-1234
+    #   number_to_phone('123a456')                                   # => 123a456
+    #
+    #   number_to_phone(1235551234, country_code: 1, extension: 1343, delimiter: '.')
+    #   # => +1.123.555.1234 x 1343
+    def number_to_phone(number, options = {})
+      return unless number
+      options = options.symbolize_keys
+
+      number       = number.to_s.strip
+      area_code    = options[:area_code]
+      delimiter    = options[:delimiter] || "-"
+      extension    = options[:extension]
+      country_code = options[:country_code]
+
+      if area_code
+        number.gsub!(/(\d{1,3})(\d{3})(\d{4}$)/,"(\\1) \\2#{delimiter}\\3")
+      else
+        number.gsub!(/(\d{0,3})(\d{3})(\d{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3")
+        number.slice!(0, 1) if number.start_with?(delimiter) && !delimiter.blank?
+      end
+
+      str = ''
+      str << "+#{country_code}#{delimiter}" unless country_code.blank?
+      str << number
+      str << " x #{extension}" unless extension.blank?
+      str
+    end
+  end
+end

data/motion/version.rb

@@ -1,3 +1,3 @@
 module MotionSupport
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/motion-support/core_ext/numeric/conversions_spec.rb

@@ -0,0 +1,40 @@
+describe "Numeric" do
+  describe "conversions" do
+    describe "phone" do
+      it "should format phone number without area code" do
+        5551234.to_s(:phone).should == "555-1234"
+      end
+      
+      it "should format long number without area code" do
+        225551212.to_s(:phone).should == "22-555-1212"
+        8005551212.to_s(:phone).should == "800-555-1212"
+      end
+      
+      it "should format phone number with area code" do
+        8005551212.to_s(:phone, :area_code => true).should == "(800) 555-1212"
+      end
+      
+      it "should format phone number with custom delimiter" do
+        8005551212.to_s(:phone, :delimiter => " ").should == "800 555 1212"
+        5551212.to_s(:phone, :delimiter => '.').should == "555.1212"
+      end
+      
+      it "should append extension to phone number" do
+        8005551212.to_s(:phone, :area_code => true, :extension => 123).should == "(800) 555-1212 x 123"
+      end
+      
+      it "should not append whitespace as extension to the phone number" do
+        8005551212.to_s(:phone, :extension => "  ").should == "800-555-1212"
+      end
+      
+      it "should format phone number with country code" do
+        8005551212.to_s(:phone, :country_code => 1).should == "+1-800-555-1212"
+        225551212.to_s(:phone, :country_code => 45).should == "+45-22-555-1212"
+      end
+      
+      it "should format phone number with country code and empty delimiter" do
+        8005551212.to_s(:phone, :country_code => 1, :delimiter => '').should == "+18005551212"
+      end
+    end
+  end
+end

data/spec/motion-support/core_ext/time/conversion_spec.rb

@@ -30,7 +30,7 @@ describe "Time" do
       end
       
       it "should convert to nsec format" do
-        @time.to_s(:nsec).should == "200502211744309N"
+        @time.to_s(:nsec).should == "20050221174430123451232"
         # Hmm. Looks like RubyMotion has an issue with nanosecs in string time formatting. It should actually be "20050221174430123456789"
       end
       

data/spec/motion-support/ns_dictionary_spec.rb

@@ -26,4 +26,28 @@ describe "NSDictionary" do
       dict.symbolize_keys.should == { :foo => 'bar' }
     end
   end
+
+  describe "with_indifferent_access" do
+    it "should work for NSDictionary instances" do
+      dict = NSMutableDictionary.alloc.init
+      dict.setValue('bar', forKey:'foo')
+      dict_indifferent = dict.with_indifferent_access
+      dict_indifferent['foo'].should == 'bar'
+      dict_indifferent[:foo].should == dict_indifferent['foo']
+    end
+
+    it "should work with nested NSDictionary instances" do
+      dict = NSMutableDictionary.alloc.init
+      dict_inner = NSMutableDictionary.alloc.init
+      dict_inner.setValue('value', forKey: 'key')
+      dict.setValue('bar', forKey:'foo')
+      dict.setValue(dict_inner, forKey: 'inner')
+
+      dict_indifferent = dict.with_indifferent_access
+      inner_indifferent = dict_indifferent['inner']
+      dict_indifferent[:inner].should == inner_indifferent
+      inner_indifferent['key'].should == dict_inner['key']
+      inner_indifferent[:key].should == inner_indifferent['key']
+    end
+  end
 end

data/spec/motion-support/number_helper_spec.rb

@@ -0,0 +1,55 @@
+describe "NumberHelper" do
+  class TestClassWithInstanceNumberHelpers
+    include MotionSupport::NumberHelper
+  end
+
+  class TestClassWithClassNumberHelpers
+    extend MotionSupport::NumberHelper
+  end
+
+  before do
+    @instance_with_helpers = TestClassWithInstanceNumberHelpers.new
+  end
+  
+  describe "number_to_phone" do
+    it "should convert number to phone" do
+      [@instance_with_helpers, TestClassWithClassNumberHelpers, MotionSupport::NumberHelper].each do |number_helper|
+        number_helper.number_to_phone(5551234).should == "555-1234"
+        number_helper.number_to_phone(8005551212).should == "800-555-1212"
+        number_helper.number_to_phone(8005551212, {:area_code => true}).should == "(800) 555-1212"
+        number_helper.number_to_phone("", {:area_code => true}).should == ""
+        number_helper.number_to_phone(8005551212, {:delimiter => " "}).should == "800 555 1212"
+        number_helper.number_to_phone(8005551212, {:area_code => true, :extension => 123}).should == "(800) 555-1212 x 123"
+        number_helper.number_to_phone(8005551212, :extension => "  ").should == "800-555-1212"
+        number_helper.number_to_phone(5551212, :delimiter => '.').should == "555.1212"
+        number_helper.number_to_phone("8005551212").should == "800-555-1212"
+        number_helper.number_to_phone(8005551212, :country_code => 1).should == "+1-800-555-1212"
+        number_helper.number_to_phone(8005551212, :country_code => 1, :delimiter => '').should == "+18005551212"
+        number_helper.number_to_phone(225551212).should == "22-555-1212"
+        number_helper.number_to_phone(225551212, :country_code => 45).should == "+45-22-555-1212"
+      end
+    end
+    
+    it "should return nil when given nil" do
+      [@instance_with_helpers, TestClassWithClassNumberHelpers, MotionSupport::NumberHelper].each do |number_helper|
+        number_helper.number_to_phone(nil).should.be.nil
+      end
+    end
+    
+    it "should not mutate options hash" do
+      [@instance_with_helpers, TestClassWithClassNumberHelpers, MotionSupport::NumberHelper].each do |number_helper|
+        options = { 'raise' => true }
+
+        number_helper.number_to_phone(1, options)
+        options.should == { 'raise' => true }
+      end
+    end
+    
+    it "should return non-numeric parameter unchanged" do
+      [@instance_with_helpers, TestClassWithClassNumberHelpers, MotionSupport::NumberHelper].each do |number_helper|
+        number_helper.number_to_phone("x", :country_code => 1, :extension => 123).should == "+1-x x 123"
+        number_helper.number_to_phone("x").should == "x"
+      end
+    end
+  end
+end

metadata

@@ -1,56 +1,49 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: motion-support
-version: !ruby/object:Gem::Version
-  version: 0.2.4
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.2.5
 platform: ruby
-authors:
+authors: 
 - Thomas Kadauke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-10-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: motion-require
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.6
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Commonly useful extensions to the standard library for RubyMotion. Ported
-  from ActiveSupport.
-email:
+  version_requirements: *id002
+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
 - .yardopts
 - Gemfile
@@ -159,6 +152,7 @@ files:
 - motion/inflector/inflections.rb
 - motion/inflector/methods.rb
 - motion/logger.rb
+- motion/number_helper.rb
 - motion/version.rb
 - spec/motion-support/_helpers/constantize_test_cases.rb
 - spec/motion-support/_helpers/inflector_test_cases.rb
@@ -196,6 +190,7 @@ files:
 - spec/motion-support/core_ext/module/reachable_spec.rb
 - spec/motion-support/core_ext/module/remove_method_spec.rb
 - spec/motion-support/core_ext/numeric/bytes_spec.rb
+- spec/motion-support/core_ext/numeric/conversions_spec.rb
 - spec/motion-support/core_ext/object/acts_like_spec.rb
 - spec/motion-support/core_ext/object/blank_spec.rb
 - spec/motion-support/core_ext/object/deep_dup_spec.rb
@@ -226,37 +221,41 @@ files:
 - spec/motion-support/inflector_spec.rb
 - spec/motion-support/ns_dictionary_spec.rb
 - spec/motion-support/ns_string_spec.rb
+- spec/motion-support/number_helper_spec.rb
 homepage: https://github.com/tkadauke/motion-support
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3988570019635634202
+      segments: 
       - 0
-      hash: 1534794484317908353
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3988570019635634202
+      segments: 
       - 0
-      hash: 1534794484317908353
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 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
@@ -293,6 +292,7 @@ test_files:
 - spec/motion-support/core_ext/module/reachable_spec.rb
 - spec/motion-support/core_ext/module/remove_method_spec.rb
 - spec/motion-support/core_ext/numeric/bytes_spec.rb
+- spec/motion-support/core_ext/numeric/conversions_spec.rb
 - spec/motion-support/core_ext/object/acts_like_spec.rb
 - spec/motion-support/core_ext/object/blank_spec.rb
 - spec/motion-support/core_ext/object/deep_dup_spec.rb
@@ -323,3 +323,4 @@ test_files:
 - spec/motion-support/inflector_spec.rb
 - spec/motion-support/ns_dictionary_spec.rb
 - spec/motion-support/ns_string_spec.rb
+- spec/motion-support/number_helper_spec.rb