axtro-roart 0.1.8 → 0.1.9

data/History.txt

@@ -1,3 +1,6 @@
+==0.1.9 / 2010-05-23
+Removed the String/Hash extensions copied from ActiveSupport and just added a dependency on ActiveSupport. Removed to_hash added to Array, as it conflicts with ActiveSupport's deep_merge.
+
 ==0.1.8 / 2010-03-16
 Added validate presence of.
 Updated specs to test validations.

data/lib/roart.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'active_support'
 module Roart
 
   # :stopdoc:

data/lib/roart/core/hash.rb

@@ -1,4 +1,3 @@
-require "#{File.dirname(__FILE__)}/hash/indifferent_access.rb"
 class Hash
   def to_content_format
     fields = self.map do |key,value|

data/lib/roart/ticket.rb

@@ -2,7 +2,7 @@ module Roart
 
   module Tickets
 
-    DefaultAttributes = %w(queue owner creator subject status priority initial_priority final_priority requestors cc admin_cc created starts started due resolved told last_updated time_estimated time_worked time_left text)
+    DefaultAttributes = %w(queue owner creator subject status priority initial_priority final_priority requestors cc admin_cc created starts started due resolved told last_updated time_estimated time_worked time_left text).inject({}){|memo, k| memo[k] = nil; memo}
     RequiredAttributes = %w(queue subject)
 
   end
@@ -23,9 +23,9 @@ module Roart
     #
     def initialize(attributes=nil)
       if attributes
-        @attributes = Roart::Tickets::DefaultAttributes.to_hash.merge(attributes)
+        @attributes = Roart::Tickets::DefaultAttributes.merge(attributes)
       else
-        @attributes = Roart::Tickets::DefaultAttributes.to_hash
+        @attributes = Roart::Tickets::DefaultAttributes
       end
       @attributes.update(:id => 'ticket/new')
       @saved = false

data/roart.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{axtro-roart}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["PJ Davis"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{Interface for working with Request Tracker (RT) tickets inspired by ActiveRecord.}
   s.email = %q{pj.davis@gmail.com}
   s.extra_rdoc_files = ["History.txt", "README.rdoc", "spec/test_data/full_history.txt", "spec/test_data/search_ticket.txt", "spec/test_data/single_history.txt", "spec/test_data/ticket.txt"]
-  s.files = ["History.txt", "README.rdoc", "Rakefile", "lib/roart.rb", "lib/roart/callbacks.rb", "lib/roart/connection.rb", "lib/roart/connection_adapter.rb", "lib/roart/connection_adapters/mechanize_adapter.rb", "lib/roart/core/array.rb", "lib/roart/core/hash.rb", "lib/roart/core/hash/indifferent_access.rb", "lib/roart/core/string.rb", "lib/roart/errors.rb", "lib/roart/history.rb", "lib/roart/roart.rb", "lib/roart/ticket.rb", "lib/roart/ticket_page.rb", "lib/roart/validations.rb", "roart.gemspec", "spec/roart/callbacks_spec.rb", "spec/roart/connection_adapter_spec.rb", "spec/roart/connection_spec.rb", "spec/roart/core/array_spec.rb", "spec/roart/core/hash_spec.rb", "spec/roart/core/string_spec.rb", "spec/roart/history_spec.rb", "spec/roart/roart_spec.rb", "spec/roart/ticket_page_spec.rb", "spec/roart/ticket_spec.rb", "spec/roart/validation_spec.rb", "spec/roart_spec.rb", "spec/spec_helper.rb", "spec/test_data/full_history.txt", "spec/test_data/search_ticket.txt", "spec/test_data/single_history.txt", "spec/test_data/ticket.txt"]
+  s.files = ["History.txt", "README.rdoc", "Rakefile", "lib/roart.rb", "lib/roart/callbacks.rb", "lib/roart/connection.rb", "lib/roart/connection_adapter.rb", "lib/roart/connection_adapters/mechanize_adapter.rb", "lib/roart/core/hash.rb", "lib/roart/errors.rb", "lib/roart/history.rb", "lib/roart/roart.rb", "lib/roart/ticket.rb", "lib/roart/ticket_page.rb", "lib/roart/validations.rb", "roart.gemspec", "spec/roart/callbacks_spec.rb", "spec/roart/connection_adapter_spec.rb", "spec/roart/connection_spec.rb", "spec/roart/core/hash_spec.rb", "spec/roart/history_spec.rb", "spec/roart/roart_spec.rb", "spec/roart/ticket_page_spec.rb", "spec/roart/ticket_spec.rb", "spec/roart/validation_spec.rb", "spec/roart_spec.rb", "spec/spec_helper.rb", "spec/test_data/full_history.txt", "spec/test_data/search_ticket.txt", "spec/test_data/single_history.txt", "spec/test_data/ticket.txt"]
   s.homepage = %q{http://github.com/hennk/roart}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
@@ -18,19 +18,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Interface for working with Request Tracker (RT) tickets inspired by ActiveRecord}
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mechanize>, [">= 1.0.0"])
-      s.add_development_dependency(%q<bones>, [">= 2.5.1"])
-    else
-      s.add_dependency(%q<mechanize>, [">= 1.0.0"])
-      s.add_dependency(%q<bones>, [">= 2.5.1"])
-    end
-  else
-    s.add_dependency(%q<mechanize>, [">= 1.0.0"])
-    s.add_dependency(%q<bones>, [">= 2.5.1"])
-  end
+  s.add_runtime_dependency(%q<mechanize>, [">= 1.0.0"])
+  s.add_runtime_dependency(%q<activesupport>, [">= 2.0.0"])
+  s.add_development_dependency(%q<bones>, [">= 2.5.1"])
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: axtro-roart
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - PJ Davis
@@ -35,9 +35,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bones
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bones
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,7 +65,7 @@ dependencies:
         - 1
         version: 2.5.1
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: Interface for working with Request Tracker (RT) tickets inspired by ActiveRecord.
 email: pj.davis@gmail.com
 executables: []
@@ -72,10 +88,7 @@ files:
 - lib/roart/connection.rb
 - lib/roart/connection_adapter.rb
 - lib/roart/connection_adapters/mechanize_adapter.rb
-- lib/roart/core/array.rb
 - lib/roart/core/hash.rb
-- lib/roart/core/hash/indifferent_access.rb
-- lib/roart/core/string.rb
 - lib/roart/errors.rb
 - lib/roart/history.rb
 - lib/roart/roart.rb
@@ -86,9 +99,7 @@ files:
 - spec/roart/callbacks_spec.rb
 - spec/roart/connection_adapter_spec.rb
 - spec/roart/connection_spec.rb
-- spec/roart/core/array_spec.rb
 - spec/roart/core/hash_spec.rb
-- spec/roart/core/string_spec.rb
 - spec/roart/history_spec.rb
 - spec/roart/roart_spec.rb
 - spec/roart/ticket_page_spec.rb

data/lib/roart/core/array.rb

@@ -1,11 +0,0 @@
-class Array
-
-  def to_hash
-    h = HashWithIndifferentAccess.new
-    self.each do |element|
-      h.update(element => nil)
-    end
-    h
-  end
-
-end

data/lib/roart/core/hash/indifferent_access.rb

@@ -1,135 +0,0 @@
-unless defined?(HashWithIndifferentAccess)
-  # used from ActiveSupport
-  # Copyright (c) 2005-2009 David Heinemeier Hansson
-
-  # This class has dubious semantics and we only have it so that
-  # people can write params[:key] instead of params['key']
-  # and they get the same value for both keys.
-
-  class HashWithIndifferentAccess < Hash
-    def initialize(constructor = {})
-      if constructor.is_a?(Hash)
-        super()
-        update(constructor)
-      else
-        super(constructor)
-      end
-    end
-
-    def default(key = nil)
-      if key.is_a?(Symbol) && include?(key = key.to_s)
-        self[key]
-      else
-        super
-      end
-    end
-
-    alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
-    alias_method :regular_update, :update unless method_defined?(:regular_update)
-
-    # Assigns a new value to the hash:
-    #
-    #   hash = HashWithIndifferentAccess.new
-    #   hash[:key] = "value"
-    #
-    def []=(key, value)
-      regular_writer(convert_key(key), convert_value(value))
-    end
-
-    # Updates the instantized hash with values from the second:
-    #
-    #   hash_1 = HashWithIndifferentAccess.new
-    #   hash_1[:key] = "value"
-    #
-    #   hash_2 = HashWithIndifferentAccess.new
-    #   hash_2[:key] = "New Value!"
-    #
-    #   hash_1.update(hash_2) # => {"key"=>"New Value!"}
-    #
-    def update(other_hash)
-      other_hash.each_pair { |key, value| regular_writer(convert_key(key), convert_value(value)) }
-      self
-    end
-
-    alias_method :merge!, :update
-
-    # Checks the hash for a key matching the argument passed in:
-    #
-    #   hash = HashWithIndifferentAccess.new
-    #   hash["key"] = "value"
-    #   hash.key? :key  # => true
-    #   hash.key? "key" # => true
-    #
-    def key?(key)
-      super(convert_key(key))
-    end
-
-    alias_method :include?, :key?
-    alias_method :has_key?, :key?
-    alias_method :member?, :key?
-
-    # Fetches the value for the specified key, same as doing hash[key]
-    def fetch(key, *extras)
-      super(convert_key(key), *extras)
-    end
-
-    # Returns an array of the values at the specified indices:
-    #
-    #   hash = HashWithIndifferentAccess.new
-    #   hash[:a] = "x"
-    #   hash[:b] = "y"
-    #   hash.values_at("a", "b") # => ["x", "y"]
-    #
-    def values_at(*indices)
-      indices.collect {|key| self[convert_key(key)]}
-    end
-
-    # Returns an exact copy of the hash.
-    def dup
-      HashWithIndifferentAccess.new(self)
-    end
-
-    # Merges the instantized and the specified hashes together, giving precedence to the values from the second hash
-    # Does not overwrite the existing hash.
-    def merge(hash)
-      self.dup.update(hash)
-    end
-
-    # Performs the opposite of merge, with the keys and values from the first hash taking precedence over the second.
-    # This overloaded definition prevents returning a regular hash, if reverse_merge is called on a HashWithDifferentAccess.
-    def reverse_merge(other_hash)
-      super other_hash.with_indifferent_access
-    end
-
-    # Removes a specified key from the hash.
-    def delete(key)
-      super(convert_key(key))
-    end
-
-    def stringify_keys!; self end
-    def symbolize_keys!; self end
-    def to_options!; self end
-
-    # Convert to a Hash with String keys.
-    def to_hash
-      Hash.new(default).merge(self)
-    end
-
-    protected
-      def convert_key(key)
-        key.kind_of?(Symbol) ? key.to_s : key
-      end
-
-      def convert_value(value)
-        case value
-        when Hash
-          value.with_indifferent_access
-        when Array
-          value.collect { |e| e.is_a?(Hash) ? e.with_indifferent_access : e }
-        else
-          value
-        end
-      end
-  end
-
-end

data/lib/roart/core/string.rb

@@ -1,28 +0,0 @@
-unless defined?(ActiveSupport)
-  # used from ActiveSupport
-  # Copyright (c) 2005-2009 David Heinemeier Hansson
-
-  class String
-  
-    def underscore
-      self.gsub(/::/, '/').
-        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
-        tr("-", "_").
-        downcase
-    end
-  
-    def camelize
-      self.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-    end
-  
-    def humanize
-      self.gsub(/_id$/, "").gsub(/_/, " ").capitalize
-    end
-  
-    def blank?
-      self == ""
-    end
-  
-  end
-end

data/spec/roart/core/array_spec.rb

@@ -1,13 +0,0 @@
-require File.join(File.dirname(__FILE__), %w[ .. .. spec_helper])
-
-describe 'array extentions' do
-  
-  it 'should turn an array to a nil valued hash' do
-    array = %w[key1 key2]
-    hash = array.to_hash
-    hash.has_key?(:key1).should be_true
-    hash.has_key?(:key2).should be_true
-    hash[:key1].should be_nil
-  end
-  
-end

data/spec/roart/core/string_spec.rb

@@ -1,13 +0,0 @@
-require File.join(File.dirname(__FILE__), %w[ .. .. spec_helper])
-
-describe 'string extentions' do
-
-  it 'should underscore a word' do
-    'SomeGuy'.underscore.should == 'some_guy'
-  end
-  
-  it 'should camelcase a word' do
-    'some_guy'.camelize.should == 'SomeGuy'
-  end
-
-end