crack 0.2.0 → 0.3.0

data/crack.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crack}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{John Nunemaker}, %q{Wynn Netherland}]
@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "crack.gemspec",
     "lib/crack.rb",
-    "lib/crack/core_extensions.rb",
     "lib/crack/json.rb",
+    "lib/crack/util.rb",
     "lib/crack/xml.rb",
     "test/crack_test.rb",
     "test/data/twittersearch-firefox.json",

data/lib/crack.rb

@@ -1,8 +1,8 @@
 module Crack
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
   class ParseError < StandardError; end
 end
 
-require 'crack/core_extensions'
+require 'crack/util'
 require 'crack/json'
 require 'crack/xml'

data/lib/crack/util.rb

@@ -0,0 +1,17 @@
+module Crack
+  module Util
+    def snake_case(str)
+      return str.downcase if str =~ /^[A-Z]+$/
+      str.gsub(/([A-Z]+)(?=[A-Z][a-z]?)|\B[A-Z]/, '_\&') =~ /_*(.*)/
+      return $+.downcase
+    end
+
+    def to_xml_attributes(hash)
+      hash.map do |k,v|
+        %{#{Crack::Util.snake_case(k.to_s).sub(/^(.{1,1})/) { |m| m.downcase }}="#{v.to_s.gsub('"', '"')}"}
+      end.join(' ')
+    end
+
+    extend self
+  end
+end

data/lib/crack/xml.rb

@@ -48,12 +48,12 @@ class REXMLUtilityNode #:nodoc:
   self.available_typecasts = self.typecasts.keys
 
   def initialize(name, normalized_attributes = {})
-    
+
     # unnormalize attribute values
     attributes = Hash[* normalized_attributes.map { |key, value|
       [ key, unnormalize_xml_entities(value) ]
     }.flatten]
-    
+
     @name         = name.tr("-", "_")
     # leave the type alone if we don't know what it is
     @type         = self.class.available_typecasts.include?(attributes["type"]) ? attributes.delete("type") : attributes["type"]
@@ -173,14 +173,14 @@ class REXMLUtilityNode #:nodoc:
   # @return <String> The HTML node in text form.
   def to_html
     attributes.merge!(:type => @type ) if @type
-    "<#{name}#{attributes.to_xml_attributes}>#{@nil_element ? '' : inner_html}</#{name}>"
+    "<#{name}#{Crack::Util.to_xml_attributes(attributes)}>#{@nil_element ? '' : inner_html}</#{name}>"
   end
 
   # @alias #to_html #to_s
   def to_s
     to_html
   end
-  
+
   private
 
   def unnormalize_xml_entities value

data/test/hash_test.rb

@@ -5,53 +5,24 @@ class CrackTest < Test::Unit::TestCase
     setup do
       @hash = { :one => "ONE", "two" => "TWO", :three => "it \"should\" work" }
     end
-    
+
     should "turn the hash into xml attributes" do
-      attrs = @hash.to_xml_attributes
+      attrs = Crack::Util.to_xml_attributes(@hash)
       attrs.should =~ /one="ONE"/m
       attrs.should =~ /two="TWO"/m
       attrs.should =~ /three="it &quot;should&quot; work"/m
     end
 
     should 'preserve _ in hash keys' do
-      attrs = {
+      attrs = Crack::Util.to_xml_attributes({
         :some_long_attribute => "with short value",
         :crash               => :burn,
         :merb                => "uses extlib"
-      }.to_xml_attributes
+      })
 
       attrs.should =~ /some_long_attribute="with short value"/
       attrs.should =~ /merb="uses extlib"/
       attrs.should =~ /crash="burn"/
     end
   end
-  
-  context "to_params" do
-    {
-      { "foo" => "bar", "baz" => "bat" } => "foo=bar&baz=bat",
-      { "foo" => [ "bar", "baz" ] } => "foo[]=bar&foo[]=baz",
-      { "foo" => [ {"bar" => "1"}, {"bar" => 2} ] } => "foo[][bar]=1&foo[][bar]=2",
-      { "foo" => { "bar" => [ {"baz" => 1}, {"baz" => "2"}  ] } } => "foo[bar][][baz]=1&foo[bar][][baz]=2",
-      { "foo" => {"1" => "bar", "2" => "baz"} } => "foo[1]=bar&foo[2]=baz"
-    }.each do |hash, params|
-      should "should covert hash: #{hash.inspect} to params: #{params.inspect}" do
-        hash.to_params.split('&').sort.should == params.split('&').sort
-      end
-    end
-
-    should 'not leave a trailing &' do
-      {
-        :name => 'Bob', 
-        :address => {
-          :street => '111 Ruby Ave.', 
-          :city => 'Ruby Central', 
-          :phones => ['111-111-1111', '222-222-2222']
-        }
-      }.to_params.should_not =~ /&$/
-    end
-
-    should 'URL encode unsafe characters' do
-      {:q => "?&\" +"}.to_params.should == "q=%3F%26%22%20%2B"
-    end
-  end
 end

data/test/string_test.rb

@@ -3,29 +3,29 @@ require 'test_helper'
 class CrackTest < Test::Unit::TestCase
   context "snake_case" do
     should "lowercases one word CamelCase" do
-      "Merb".snake_case.should == "merb"
+      Crack::Util.snake_case("Merb").should == "merb"
     end
 
     should "makes one underscore snake_case two word CamelCase" do
-      "MerbCore".snake_case.should == "merb_core"
+      Crack::Util.snake_case("MerbCore").should == "merb_core"
     end
 
     should "handles CamelCase with more than 2 words" do
-      "SoYouWantContributeToMerbCore".snake_case.should == "so_you_want_contribute_to_merb_core"
+      Crack::Util.snake_case("SoYouWantContributeToMerbCore").should == "so_you_want_contribute_to_merb_core"
     end
 
     should "handles CamelCase with more than 2 capital letter in a row" do
-      "CNN".snake_case.should == "cnn"
-      "CNNNews".snake_case.should == "cnn_news"
-      "HeadlineCNNNews".snake_case.should == "headline_cnn_news"
+      Crack::Util.snake_case("CNN").should == "cnn"
+      Crack::Util.snake_case("CNNNews").should == "cnn_news"
+      Crack::Util.snake_case("HeadlineCNNNews").should == "headline_cnn_news"
     end
 
     should "does NOT change one word lowercase" do
-      "merb".snake_case.should == "merb"
+      Crack::Util.snake_case("merb").should == "merb"
     end
 
     should "leaves snake_case as is" do
-      "merb_core".snake_case.should == "merb_core"
+      Crack::Util.snake_case("merb_core").should == "merb_core"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crack
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -35,8 +35,8 @@ files:
 - Rakefile
 - crack.gemspec
 - lib/crack.rb
-- lib/crack/core_extensions.rb
 - lib/crack/json.rb
+- lib/crack/util.rb
 - lib/crack/xml.rb
 - test/crack_test.rb
 - test/data/twittersearch-firefox.json

data/lib/crack/core_extensions.rb

@@ -1,128 +0,0 @@
-require 'uri'
-
-class Object #:nodoc:
-  # @return <TrueClass, FalseClass>
-  #
-  # @example [].blank?         #=>  true
-  # @example [1].blank?        #=>  false
-  # @example [nil].blank?      #=>  false
-  # 
-  # Returns true if the object is nil or empty (if applicable)
-  def blank?
-    nil? || (respond_to?(:empty?) && empty?)
-  end unless method_defined?(:blank?)
-end # class Object
-
-class Numeric #:nodoc:
-  # @return <TrueClass, FalseClass>
-  # 
-  # Numerics can't be blank
-  def blank?
-    false
-  end unless method_defined?(:blank?)
-end # class Numeric
-
-class NilClass #:nodoc:
-  # @return <TrueClass, FalseClass>
-  # 
-  # Nils are always blank
-  def blank?
-    true
-  end unless method_defined?(:blank?)
-end # class NilClass
-
-class TrueClass #:nodoc:
-  # @return <TrueClass, FalseClass>
-  # 
-  # True is not blank.  
-  def blank?
-    false
-  end unless method_defined?(:blank?)
-end # class TrueClass
-
-class FalseClass #:nodoc:
-  # False is always blank.
-  def blank?
-    true
-  end unless method_defined?(:blank?)
-end # class FalseClass
-
-class String #:nodoc:
-  # @example "".blank?         #=>  true
-  # @example "     ".blank?    #=>  true
-  # @example " hey ho ".blank? #=>  false
-  # 
-  # @return <TrueClass, FalseClass>
-  # 
-  # Strips out whitespace then tests if the string is empty.
-  def blank?
-    strip.empty?
-  end unless method_defined?(:blank?)
-  
-  def snake_case
-    return self.downcase if self =~ /^[A-Z]+$/
-    self.gsub(/([A-Z]+)(?=[A-Z][a-z]?)|\B[A-Z]/, '_\&') =~ /_*(.*)/
-    return $+.downcase
-  end unless method_defined?(:snake_case)
-end # class String
-
-class Hash #:nodoc:
-  # @return <String> This hash as a query string
-  #
-  # @example
-  #   { :name => "Bob",
-  #     :address => {
-  #       :street => '111 Ruby Ave.',
-  #       :city => 'Ruby Central',
-  #       :phones => ['111-111-1111', '222-222-2222']
-  #     }
-  #   }.to_params
-  #     #=> "name=Bob&address[city]=Ruby Central&address[phones][]=111-111-1111&address[phones][]=222-222-2222&address[street]=111 Ruby Ave."
-  def to_params
-    params = self.map { |k,v| normalize_param(k,v) }.join
-    params.chop! # trailing &
-    params
-  end
-
-  # @param key<Object> The key for the param.
-  # @param value<Object> The value for the param.
-  #
-  # @return <String> This key value pair as a param
-  #
-  # @example normalize_param(:name, "Bob Jones") #=> "name=Bob%20Jones&"
-  def normalize_param(key, value)
-    param = ''
-    stack = []
-
-    if value.is_a?(Array)
-      param << value.map { |element| normalize_param("#{key}[]", element) }.join
-    elsif value.is_a?(Hash)
-      stack << [key,value]
-    else
-      param << "#{key}=#{URI.encode(value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}&"
-    end
-
-    stack.each do |parent, hash|
-      hash.each do |key, value|
-        if value.is_a?(Hash)
-          stack << ["#{parent}[#{key}]", value]
-        else
-          param << normalize_param("#{parent}[#{key}]", value)
-        end
-      end
-    end
-
-    param
-  end
-  
-  # @return <String> The hash as attributes for an XML tag.
-  #
-  # @example
-  #   { :one => 1, "two"=>"TWO" }.to_xml_attributes
-  #     #=> 'one="1" two="TWO"'
-  def to_xml_attributes
-    map do |k,v|
-      %{#{k.to_s.snake_case.sub(/^(.{1,1})/) { |m| m.downcase }}="#{v.to_s.gsub('"', '&quot;')}"}
-    end.join(' ')
-  end
-end