phrase 0.3.4 → 0.3.5

data/lib/ext/all.rb

@@ -0,0 +1,3 @@
+require 'ext/object'
+require 'ext/try'
+require 'ext/hash'

data/lib/ext/hash.rb

@@ -0,0 +1,8 @@
+class Hash  
+  def symbolize_keys!
+    keys.each do |key|
+      self[(key.to_sym rescue key) || key] = delete(key)
+    end
+    self
+  end
+end

data/lib/ext/object.rb

@@ -0,0 +1,130 @@
+# encoding: utf-8
+
+class Object
+  # An object is blank if it's false, empty, or a whitespace string.
+  # For example, "", "   ", +nil+, [], and {} are all blank.
+  #
+  # This simplifies:
+  #
+  #   if address.nil? || address.empty?
+  #
+  # ...to:
+  #
+  #   if address.blank?
+  def blank?
+    respond_to?(:empty?) ? empty? : !self
+  end
+
+  # An object is present if it's not <tt>blank?</tt>.
+  def present?
+    !blank?
+  end
+
+  # Returns object if it's <tt>present?</tt> otherwise returns +nil+.
+  # <tt>object.presence</tt> is equivalent to <tt>object.present? ? object : nil</tt>.
+  #
+  # This is handy for any representation of objects where blank is the same
+  # as not present at all. For example, this simplifies a common check for
+  # HTTP POST/query parameters:
+  #
+  #   state   = params[:state]   if params[:state].present?
+  #   country = params[:country] if params[:country].present?
+  #   region  = state || country || 'US'
+  #
+  # ...becomes:
+  #
+  #   region = params[:state].presence || params[:country].presence || 'US'
+  def presence
+    self if present?
+  end
+end
+
+class NilClass
+  # +nil+ is blank:
+  #
+  #   nil.blank? # => true
+  #
+  def blank?
+    true
+  end
+end
+
+class FalseClass
+  # +false+ is blank:
+  #
+  #   false.blank? # => true
+  #
+  def blank?
+    true
+  end
+end
+
+class TrueClass
+  # +true+ is not blank:
+  #
+  #   true.blank? # => false
+  #
+  def blank?
+    false
+  end
+end
+
+class Array
+  # An array is blank if it's empty:
+  #
+  #   [].blank?      # => true
+  #   [1,2,3].blank? # => false
+  #
+  alias_method :blank?, :empty?
+end
+
+class Hash
+  # A hash is blank if it's empty:
+  #
+  #   {}.blank?                # => true
+  #   {:key => 'value'}.blank? # => false
+  #
+  alias_method :blank?, :empty?
+end
+
+class String
+  if defined?(Encoding) && "".respond_to?(:encode)
+    def encoding_aware?
+      true
+    end
+  else
+    def encoding_aware?
+      false
+    end
+  end
+
+  # 0x3000: fullwidth whitespace
+  NON_WHITESPACE_REGEXP = %r![^\s#{[0x3000].pack("U")}]!
+
+  # A string is blank if it's empty or contains whitespaces only:
+  #
+  #   "".blank?                 # => true
+  #   "   ".blank?              # => true
+  #   "　".blank?               # => true
+  #   " something here ".blank? # => false
+  #
+  def blank?
+    # 1.8 does not takes [:space:] properly
+    if encoding_aware?
+      self !~ /[^[:space:]]/
+    else
+      self !~ NON_WHITESPACE_REGEXP
+    end
+  end
+end
+
+class Numeric #:nodoc:
+  # No number is blank:
+  #
+  #   1.blank? # => false
+  #   0.blank? # => false
+  #
+  def blank?
+    false
+  end
+end

data/lib/ext/try.rb

@@ -0,0 +1,57 @@
+class Object
+  # Invokes the method identified by the symbol +method+, passing it any arguments
+  # and/or the block specified, just like the regular Ruby <tt>Object#send</tt> does.
+  #
+  # *Unlike* that method however, a +NoMethodError+ exception will *not* be raised
+  # and +nil+ will be returned instead, if the receiving object is a +nil+ object or NilClass.
+  #
+  # If try is called without a method to call, it will yield any given block with the object.
+  #
+  # Please also note that +try+ is defined on +Object+, therefore it won't work with
+  # subclasses of +BasicObject+. For example, using try with +SimpleDelegator+ will
+  # delegate +try+ to target instead of calling it on delegator itself.
+  #
+  # ==== Examples
+  #
+  # Without +try+
+  #   @person && @person.name
+  # or
+  #   @person ? @person.name : nil
+  #
+  # With +try+
+  #   @person.try(:name)
+  #
+  # +try+ also accepts arguments and/or a block, for the method it is trying
+  #   Person.try(:find, 1)
+  #   @people.try(:collect) {|p| p.name}
+  #
+  # Without a method argument try will yield to the block unless the receiver is nil.
+  #   @person.try { |p| "#{p.first_name} #{p.last_name}" }
+  #--
+  # +try+ behaves like +Object#send+, unless called on +NilClass+.
+  def try(*a, &b)
+    if a.empty? && block_given?
+      yield self
+    else
+      __send__(*a, &b)
+    end
+  end
+end
+
+class NilClass
+  # Calling +try+ on +nil+ always returns +nil+.
+  # It becomes specially helpful when navigating through associations that may return +nil+.
+  #
+  # === Examples
+  #
+  #   nil.try(:name) # => nil
+  #
+  # Without +try+
+  #   @person && !@person.children.blank? && @person.children.first.name
+  #
+  # With +try+
+  #   @person.try(:children).try(:first).try(:name)
+  def try(*args)
+    nil
+  end
+end

data/lib/phrase.rb

@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
-
-require 'active_support/all'
+require 'ext/all'
 require 'colorize'
 
 module Phrase

data/lib/phrase/adapters/fast_gettext.rb

@@ -7,16 +7,19 @@ module FastGettext
     def __with_phrase(*args)
       Phrase::Delegate::FastGettext.new(:_, *args)
     end
-    alias_method_chain :_, :phrase
+    alias_method :__without_phrase, :_
+    alias_method :_, :__with_phrase
     
     def n__with_phrase(*args)
       Phrase::Delegate::FastGettext.new(:n_, *args)
     end
-    alias_method_chain :n_, :phrase
+    alias_method :n__without_phrase, :n_
+    alias_method :n_, :n__with_phrase
     
     def s__with_phrase(*args)
       Phrase::Delegate::FastGettext.new(:s_, *args)
     end
-    alias_method_chain :s_, :phrase
+    alias_method :s__without_phrase, :s_
+    alias_method :s_, :s__with_phrase    
   end
 end if defined? FastGettext::Translation

data/lib/phrase/adapters/i18n.rb

@@ -5,7 +5,8 @@ module I18n
     def translate_with_phrase(*args)
       Phrase.backend.translate(*args)
     end
-    alias_method_chain :translate, :phrase
+    alias_method :translate_without_phrase, :translate
+    alias_method :translate, :translate_with_phrase
     alias_method :t, :translate
   end
 end if defined?(I18n)

data/lib/phrase/api/client.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 require 'cgi'
+require 'json'
 require 'net/http'
 require 'net/https'
 require 'phrase'
@@ -191,7 +192,7 @@ private
     client = Net::HTTP.new(Phrase::Api::Config.api_host, Phrase::Api::Config.api_port)
     client.use_ssl = true if Phrase::Api::Config.api_use_ssl?
     client.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    client.ca_file = File.join(File.dirname(__FILE__), "..", "..", "cacert.pem")
+    client.ca_file = File.join(File.dirname(__FILE__), "..", "..", "..", "cacert.pem")
     client
   end
   

data/lib/phrase/backend/phrase_service.rb

@@ -68,7 +68,6 @@ protected
     transform_args_based_on_caller(duped_args)
   end
 
-
   def normalized_key(duped_args)
     splitted_args = split_args(duped_args)
     key = I18n::Backend::Flatten.normalize_flat_keys(*splitted_args)

data/lib/phrase/delegate/fast_gettext.rb

@@ -15,7 +15,7 @@ private
       when :_
         {msgid: args.first}
       when :n_
-        {msgid: args.first, msgid_plural: args.second, count: args.last}
+        {msgid: args.first, msgid_plural: args[1], count: args.last}
       when :s_
         {msgid: args.first}
       else
@@ -24,4 +24,4 @@ private
     end
     params
   end
-end
+end

data/lib/phrase/delegate/i18n.rb

@@ -112,6 +112,10 @@ private
       if @key == "helpers.label.#{entry}" # http://apidock.com/rails/v3.1.0/ActionView/Helpers/FormHelper/label
         @fallback_keys << "activerecord.attributes.#{entry}"
       end
+
+      if @key.start_with?("simple_form.") # special treatment for simple form
+        @fallback_keys << "activerecord.attributes.#{item.to_s}"
+      end
     end
   end
   
@@ -156,4 +160,4 @@ private
     end unless (data.is_a?(String) || data.nil?)
     key_names
   end
-end
+end

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/phrase/view_helpers.rb

@@ -1,5 +1,4 @@
 module Phrase::ViewHelpers
-  
   def phrase_javascript(auth_token=nil)
     return "" unless Phrase.enabled?
     
@@ -15,6 +14,6 @@ module Phrase::ViewHelpers
     })();
   //]]>
 </script>}
-    js.html_safe
+    js.respond_to?(:html_safe) ? js.html_safe : js
   end
-end
+end

data/phrase.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |s|
   s.files = git_files
   s.test_files = s.files.grep(%r{^(spec)/})
   s.executables = %w(phrase)
-  s.require_paths = ["lib"]  
-  s.add_dependency('activesupport', '~> 3.0')
+  s.require_paths = ["lib"]
   s.add_dependency('colorize')
   s.add_dependency('json')
   s.add_development_dependency('rake')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70288255847780 !ruby/object:Gem::Requirement
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70288255847780
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: &70288255847400 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70288255847400
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70288255846940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70288255846940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70288255846520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70288255846520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70288255846100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70288255846100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70288255845680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70288255845680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70288255845260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70288255845260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70288255844840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70288255844840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70288255844420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70288255844420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: phrase allows you to edit translations in-place on the page itself. More
   information at phraseapp.com
 email:
@@ -129,6 +158,10 @@ files:
 - Rakefile
 - bin/phrase
 - cacert.pem
+- lib/ext/all.rb
+- lib/ext/hash.rb
+- lib/ext/object.rb
+- lib/ext/try.rb
 - lib/phrase.rb
 - lib/phrase/adapters/fast_gettext.rb
 - lib/phrase/adapters/i18n.rb
@@ -200,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: phrase
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The best way to manage i18n.