hotwire 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/hotwire.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hotwire}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Freeman"]

data/lib/hotwire/response/active_record_mixin.rb

@@ -14,7 +14,7 @@ module Hotwire
       end
       
       def set_data_with_active_record_collection(data)
-        data = rows_from_active_record_collection(data) if data.first.is_a?(ActiveRecord::Base)
+        data = rows_from_active_record_collection(data) if data.respond_to?(:first) and data.first.is_a?(ActiveRecord::Base)
         set_data_without_active_record_collection(data)
       end
       

data/lib/hotwire/response/base.rb

@@ -40,7 +40,7 @@ module Hotwire
       #
       # or a sample row of data, represented as a hash keyed as column_name => value:
       #   add_columns({:column_a => 'a1', :column_b => 'b1})
-      # column_name keys are expected to be symbols(string keys do not maintain order).
+      # column_name keys are expected to be strings.
       def add_columns(columns)
         if columns.first.is_a?(Hash)
           add_columns_from_data_hash(columns)
@@ -61,7 +61,7 @@ module Hotwire
       # If passing an array of column_name => value hashes and no columns have been added,
       # a column will automatically be added for each entry in the first row of data.
       # If columns have already been added then the data will be filtered to those
-      # columns. column_name keys are expected to be symbols(string keys do not maintain order).
+      # columns. column_name keys are expected to be strings.
       #
       # If passing a hash with :columns key and a :rows key, 
       # :columns should be an array of column ids: ['col_a', 'col_b'...'col_N']
@@ -87,7 +87,7 @@ module Hotwire
       # Adds columns to the response based on a sample row of data in the form of a hash
       # keyed as column_name => value
       def add_columns_from_data_hash(data)
-        data.first.each do |key, value|
+        data.first.sort.each do |key, value|
           add_column(column_type_for_value(value), :id => key.to_s, :label => key.to_s)
         end
       end
@@ -133,7 +133,7 @@ module Hotwire
       # Data is filtered on the columns that exist.
       def set_data_from_array_of_hashes(data)
         add_columns(data) if columns.empty?
-        set_data(data.map { |row| self.columns.map { |c| row[c[:id].to_sym] } })
+        set_data(data.map { |row| self.columns.map { |c| row[c[:id].to_s] } })
       end
       
       # Sets the response data from a two dimensional array of innumerables.

data/test/response/test_base.rb

@@ -43,24 +43,24 @@ class TestResponseBase < Test::Unit::TestCase
           context "when columns are not set" do
             setup do
               @datetime = Time.utc(2010, 11, 2, 9, 35, 00)
-              @data = [{:string_col => 'a1', :int_col => 2, :decimal_col => 3.3, :datetime_col => @datetime}]
+              @data = [{'string_col' => 'a1', 'int_col' => 2, 'decimal_col' => 3.3, 'datetime_col' => @datetime}]
               @response.set_data(@data)
             end
             should "add columns to the response" do
-              expected = [{:id => 'string_col', :label => "string_col", :type => 'string'},
-                          {:id => 'int_col', :label => "int_col", :type => 'number'},
+              expected = [{:id => 'datetime_col', :label => "datetime_col", :type => 'datetime'},
                           {:id => 'decimal_col', :label => "decimal_col", :type => 'number'},
-                          {:id => 'datetime_col', :label => "datetime_col", :type => 'datetime'}]
+                          {:id => 'int_col', :label => "int_col", :type => 'number'},
+                          {:id => 'string_col', :label => "string_col", :type => 'string'}]
               assert_equal expected, @response.columns
             end
             should "set the data for the response" do
-              assert_equal [['a1', 2, 3.3, @datetime]], @response.data
+              assert_equal [[@datetime, 3.3, 2, 'a1']], @response.data
             end
           end
           
           context "when columns are already set" do
             setup do
-              @data = [{:col_a => 'a1', :col_b => 'b1', :col_c => 'c1'}]
+              @data = [{'col_a' => 'a1', 'col_b' => 'b1', 'col_c' => 'c1'}]
               @response.add_columns([['string', {:id => 'col_c', :label => 'col_c'}],
                                      ['string', {:id => 'col_a', :label => 'col_a'}]])
               @response.set_data(@data)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hotwire
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Les Freeman