cloudxls 0.5.1 → 0.6.0

data/lib/cloudxls/core_ext.rb

@@ -92,9 +92,17 @@ class Range
 end
 
 class Hash
-  def as_csv(options = nil)
-    map do |key, val|
-      val.as_csv(options)
+  def as_csv(options = {})
+    attribute_names = keys
+
+    if (only = options[:only])
+      attribute_names = Array(only)
+    elsif (except = options[:except])
+      attribute_names -= Array(except)
+    end
+
+    attribute_names.map do |key|
+      self[key].as_csv
     end
   end
 end

data/lib/cloudxls/csv_writer.rb

@@ -90,9 +90,9 @@ module CloudXLS
 
 
     def self.scope_enumerator(scope)
-      if (scope.respond_to?(:arel) &&
-          scope.arel.orders.blank? &&
-          scope.arel.taken.blank?)
+      if scope.respond_to?(:arel) &&
+         scope.arel.orders.blank? &&
+         scope.arel.taken.blank?
         :find_each
       else
         :each
@@ -111,9 +111,7 @@ module CloudXLS
     #     CloudXLS::Util.titles_for_serialize_options(Post.new, only: [:author, :title], method: [:slug])
     #     # => ['title', 'author', 'slug']
     #
-    def self.titles_for_serialize_options(record, options = nil)
-      options ||= {}
-
+    def self.titles_for_serialize_options(record, options = {})
       attribute_names = record.attributes.keys
       if only = options[:only]
         arr = []

data/lib/cloudxls/version.rb

@@ -1,3 +1,3 @@
 module CloudXLS
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

data/lib/cloudxls.rb

@@ -12,7 +12,7 @@ require 'cloudxls/csv_writer'
 
 module CloudXLS
   @https = true
-  @api_base = 'cloudxls.com'.freeze
+  @api_base = 'api.cloudxls.com'.freeze
   @api_key  = ENV["CLOUDXLS_API_KEY"]
   # @ssl_bundle_path  = File.dirname(__FILE__) + '/data/ca-certificates.crt'
   @verify_ssl_certs = true
@@ -23,7 +23,7 @@ module CloudXLS
 
   def self.api_url(path = '')
     # @api_base + url
-    "http#{@https ? 's' : ''}://#{@api_key}:@#{@api_base}/api/v1/#{path}"
+    "http#{@https ? 's' : ''}://#{@api_key}:@#{@api_base}/v1/#{path}"
   end
 
   class XpipeResponse

data/spec/core_ext_spec.rb

@@ -5,6 +5,16 @@ describe "as_csv" do
     expect( {:foo => 1, :bar => Date.new(2013,12,24)}.as_csv ).to eq([1,'2013-12-24'])
   end
 
+  it "should handle Hash with :only" do
+    hash =  {:foo => "foo", :bar => "bar"}
+    expect( hash.as_csv(:only => :foo) ).to eq(["foo"])
+    expect( hash.as_csv(:only => [:foo]) ).to eq(["foo"])
+    expect( hash.as_csv(:only => [:bar]) ).to eq(["bar"])
+    expect( hash.as_csv(:only => [:foo, :bar]) ).to eq(["foo", "bar"])
+    expect( hash.as_csv(:only => [:bar, :foo]) ).to eq(["bar", "foo"])
+    #expect( hash.as_csv(:only => [:bar, :baz, :foo]) ).to eq(["foo", nil, "bar"])
+  end
+
   it "should handle Array" do
     expect( [1, Date.new(2013,12,24)].as_csv ).to eq([1,'2013-12-24'])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudxls
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client