cloudsheet 0.1.0 → 0.2.0

data/README.rdoc

@@ -1,20 +1,22 @@
 = Cloudsheet
 Load Google Drive Spreadsheets sanely.
 
-Setup a Google Drive Session and pass it into Cloudsheet along with the Google Spreadsheet ID (seen in the url)
+Setup the Cloudsheet. sheet is an optional worksheet ID.
+      cloudsheet = Cloudsheet::Drive.new(user: "me@example.com", password: "secret", sheet_key: "SPREADSHEETID")
 
-      drive = GoogleDrive.login("user@example.com", "mypassword")
-      cloudsheet = Cloudsheet::Drive.new(drive, "SPREADSHEETID")
-
-Setup an optional mapping of column #s to names and lambdas.
+Setup an optional mapping of column #s to names and lambdas. The default operation is to no-op.
 
       m = Cloudsheet::Map.new
       m[0] = Cloudsheet::Mapping.new(:name)
-      m[1] = Cloudsheet::Mapping.new(:start_date, ->(d) {DateTime.strptime(d, "%m/%d/%Y")})
+      m[1] = Cloudsheet::Mapping.new(:score).type(Float)
+      m[2] = Cloudsheet::Mapping.new(:cash).type("money")
+      m[3] = Cloudsheet::Mapping.new(:start_date).map(->(d) {DateTime.strptime(d, "%m/%d/%Y")})
+
+The map will try to do the right thing and if nil is passed in, it will skip the lambda and output nil.
 
 Select a worksheet if not the first one and pass in an optional map
     
-      cloudsheet.worksheet(0).map(m)
+      cloudsheet.sheet(0).map(m)
       cloudsheet.each do |row|
         row["name"] # Column 0
         row["start_date"] # DateTime object created from column 1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/cloudsheet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cloudsheet"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kurt Nelson"]
-  s.date = "2012-10-18"
+  s.date = "2012-10-19"
   s.description = "Pull google drive spreadsheets with your column names and datatypes"
   s.email = "kurtisnelson@gmail.com"
   s.extra_rdoc_files = [
@@ -26,9 +26,14 @@ Gem::Specification.new do |s|
     "VERSION",
     "cloudsheet.gemspec",
     "lib/cloudsheet.rb",
+    "lib/cloudsheet/drive.rb",
+    "lib/cloudsheet/map.rb",
     "lib/cloudsheet/mapping.rb",
     "lib/cloudsheet/row.rb",
+    "lib/cloudsheet/sheet.rb",
     "spec/drive_spec.rb",
+    "spec/mapping_spec.rb",
+    "spec/row_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/kurtisnelson/cloudsheet"

data/lib/cloudsheet.rb

@@ -1,33 +1 @@
-require_relative "cloudsheet/row"
-require_relative "cloudsheet/mapping"
-
-module Cloudsheet
-  class Drive
-    attr_reader :sheet, :spreadsheet
-    def initialize(drive_session, spreadsheet)
-      @spreadsheet = drive_session.spreadsheet_by_key(spreadsheet)
-      @sheet = @spreadsheet.worksheets[0]
-    end
-
-    def worksheet(num)
-      @sheet = @spreadsheet.worksheets[num]
-      self
-    end
-
-    def map(m)
-      @map = m
-      self
-    end
-
-    def each
-      rower = Cloudsheet::Row.new(@map)
-      rows.each do |r|
-        yield rower.parse(r)
-      end
-    end
-
-    def rows
-      @sheet.rows.drop(1)
-    end
-  end
-end
+require_relative "cloudsheet/drive"

data/lib/cloudsheet/drive.rb

@@ -0,0 +1,34 @@
+require "cloudsheet/sheet"
+
+module Cloudsheet
+  class Drive < Sheet
+    def initialize(hash)
+      if hash[:user] and hash[:password]
+        drive = GoogleDrive.login(hash[:user], hash[:password])
+      else
+        raise "Missing Google Credentials"
+      end
+
+      if hash[:sheet_key]
+        @workbook = drive.spreadsheet_by_key(hash[:sheet_key])
+      else
+        raise "Missing sheet key"
+      end
+
+      if hash[:sheet]
+        @raw_sheet = @workbook.worksheets[hash[:sheet]]
+      else
+        @raw_sheet = @workbook.worksheets[0]
+      end
+    end
+
+    def sheet(num)
+      @raw_sheet = @workbook.worksheets[num]
+      self
+    end
+
+    def rows
+      super.drop(1)
+    end
+  end
+end

data/lib/cloudsheet/map.rb

@@ -0,0 +1,29 @@
+module Cloudsheet
+  class Map
+    def initialize
+      @data = {}
+    end
+
+    def []=(i,val)
+      @data[i] = val
+    end
+
+    def [](i)
+      if @data[i]
+        @data[i]
+      else
+        Mapping.new(i)
+      end
+    end
+
+    def read(i, d)
+      return nil unless d
+      self[i].read.call d
+    end
+
+    def write(i, d)
+      return "" unless d
+      self[i].write.call d
+    end
+  end
+end

data/lib/cloudsheet/mapping.rb

@@ -1,26 +1,51 @@
 module Cloudsheet
-  class Map
-    def initialize
-      @data = {}
+  class Mapping
+    attr_reader :name, :read
+    TO_S = ->(d) {d.to_s}
+    NOOP = ->(d) {d}
+    def initialize(name)
+      @name = name
+      @read = NOOP
+      @write = NOOP
     end
-
-    def []=(i,val)
-      @data[i] = val
+    
+    def map(read, write = nil)
+      @read = read
+      @write = write if write
+      self
     end
 
-    def [](i)
-      if @data[i]
-        @data[i]
+    def type(klass)
+      klass = klass.to_s
+      klass.downcase!
+      case klass #Because case uses ===
+      when ""
+      when "noop"
+      when "string"
+        @read = ->(d) {String.new(d) if d}
+        @write = TO_S
+      when "date"
+        @read = ->(d) {Date.parse(d) if not d.empty?}
+        @write = TO_S
+      when "float"
+        @read = ->(d) {d.to_f if not d.empty?}
+        @write = TO_S
+      when "integer"
+        @read = ->(d) {d.to_i if not d.empty?}
+        @write = TO_S
+      when "datetime"
+        @read = ->(d) {DateTime.parse(d) if not d.empty?}
+        @write = TO_S
+      when "money"
+        @read = ->(d) {d.gsub(',','').gsub('$','').to_f}
+        @write = ->(d) {"$"+d.to_s}
+      when "month"
+        @read = ->(d) {Date.strptime(d, '%m/%Y') if not d.empty?}
+        @write = ->(d) {d.strftime("%m/%Y")}
       else
-        Mapping.new(i)
+        raise "No mapping for that type is built in"
       end
-    end
-  end
-  
-  class Mapping < Struct.new :name, :function
-    def initialize(name, func = ->(d) {String.new(d)})
-      self.name = name
-      self.function = func
+      self
     end
   end
 end

data/lib/cloudsheet/row.rb

@@ -1,19 +1,16 @@
 module Cloudsheet
-  class Row
-    def initialize(map = nil)
+  class Row < Hash
+    def initialize(map)
       @map = map
     end
 
-    def parse(data)
-      if @map
-        out = { }
-        data.each_with_index do |d, i|
-          out[@map[i].name] = @map[i].function.call d
-        end
-        return out
-      else
-        return data.to_a
+    def self.parse(data, map = nil)
+      map = Cloudsheet::Map.new unless map  
+      row = self.new(map)
+      data.each_with_index do |d, i|
+        row[map[i].name] = map.read(i, d)
       end
+      row
     end
   end
 end

data/lib/cloudsheet/sheet.rb

@@ -0,0 +1,29 @@
+require "cloudsheet/row"
+require "cloudsheet/map"
+require "cloudsheet/mapping"
+
+module Cloudsheet
+  class Sheet
+    attr_reader :raw_sheet, :workbook
+
+    def map(m)
+      @map = m
+      self
+    end
+
+    def each
+      rows.each do |r|
+        yield Row.parse(r, @map)
+      end
+    end
+
+    def rows
+      @raw_sheet.rows
+    end
+
+    def sheet(num)
+      @raw_sheet = @workbook[num]
+      self
+    end
+  end
+end

data/spec/drive_spec.rb

@@ -2,19 +2,19 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require "google_drive"
 
 describe Cloudsheet::Drive do
-  before :each do
-    @drive = GoogleDrive.login(ENV['G_USERNAME'], ENV['G_PASSWORD'])
+  before :all do
+    @google_spreadsheet = GoogleDrive.login(ENV['G_USERNAME'], ENV['G_PASSWORD']).spreadsheet_by_key(ENV['G_SPREADSHEET'])
   end
-  let(:google_spreadsheet) {@drive.spreadsheet_by_key(ENV['G_SPREADSHEET'])}
-  
-  subject{Cloudsheet::Drive.new(@drive, ENV['G_SPREADSHEET'])}
+ 
+  context "properly initialized" do
+  subject{Cloudsheet::Drive.new(user: ENV['G_USERNAME'], password: ENV['G_PASSWORD'], sheet_key: ENV['G_SPREADSHEET'])}
   
   it "initializes" do
-    subject.spreadsheet.worksheets_feed_url.should eq(google_spreadsheet.worksheets_feed_url)
+    subject.raw_sheet.worksheet_feed_url.should eq(@google_spreadsheet.worksheets[0].worksheet_feed_url)
   end
 
   it "selects a worksheet" do
-    subject.worksheet(0).sheet.worksheet_feed_url.should eq(google_spreadsheet.worksheets[0].worksheet_feed_url)
+    subject.sheet(0).raw_sheet.worksheet_feed_url.should eq(@google_spreadsheet.worksheets[0].worksheet_feed_url)
   end
 
   describe "rows" do
@@ -24,7 +24,7 @@ describe Cloudsheet::Drive do
 
     it "is enumerated without a map" do
       i = 2
-      ws = google_spreadsheet.worksheets[0]
+      ws = @google_spreadsheet.worksheets[0]
       subject.each do |r|
         r[0].should eq(ws[i, 1])
         i += 1
@@ -34,17 +34,25 @@ describe Cloudsheet::Drive do
     it "enumerates with a map" do
       m = Cloudsheet::Map.new
       m[0] = Cloudsheet::Mapping.new(:name)
-      m[1] = Cloudsheet::Mapping.new(:start_date, ->(d) {DateTime.strptime(d, "%m/%d/%Y")})
+      m[1] = Cloudsheet::Mapping.new(:start_date).map(->(d) {DateTime.strptime(d, "%m/%d/%Y")})
+      m[3] = Cloudsheet::Mapping.new(3)
       subject.map(m)
 
-      ws = google_spreadsheet.worksheets[0]
+      ws = @google_spreadsheet.worksheets[0]
       i = 2
       subject.each do |r|
         r[:name].should eq(ws[i, 1])
         r[:start_date].should eq(DateTime.strptime(ws[i, 2], "%m/%d/%Y"))
         r[2].should eq(ws[i, 3])
+        r[3].should eq(ws[i, 4])
         i += 1
       end
     end
   end
+  end
+  context "missing parameters" do
+    it "fails without sheet_key" do
+      ->{Cloudsheet::Drive.new(user: ENV['G_USERNAME'], password: ENV['G_PASSWORD'])}.should raise_error
+    end
+  end
 end

data/spec/mapping_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe Cloudsheet::Mapping do
+  subject { Cloudsheet::Mapping.new(:test) }
+  describe "#map" do
+    it "always returns self" do
+      subject.map(nil).should be subject
+    end
+  end
+  
+  describe "#type" do
+    specify{ expect{subject.type(Object)}.to raise_error}
+    it "defaults to no-op" do
+      subject.read.call(nil).should be_nil
+      obj = Object.new
+      subject.read.call(obj).should be obj
+    end
+
+    it "always returns self" do
+      subject.type(nil).should be subject
+    end
+
+    it "supports String" do
+      subject.type(String)
+      subject.read.call("Hello").should eq(String.new("Hello"))
+      subject.read.call("").should eq("")
+    end
+
+    it "supports Date" do
+      subject.type(Date)
+      subject.read.call(Date.today.to_s).should eq(Date.today)
+      subject.read.call("").should be_nil
+    end
+
+    it "supports DateTime" do
+      subject.type(DateTime)
+      now = DateTime.now
+      subject.read.call(now.to_s).should eq(DateTime.parse(now.to_s))
+    end
+
+    it "supports Integer" do
+      subject.type(Integer)
+      num = Random.rand(0...100)
+      subject.read.call(num.to_s).should eq(num)
+    end
+
+    it "supports Float" do
+      subject.type(Float)
+      subject.read.call("100.5").should eq(100.5)
+    end
+
+    it "supports money" do
+      subject.type("money")
+      subject.read.call("$100,981.02").should eq(100981.02)
+    end
+
+    it "supports month" do
+      subject.type("month")
+      subject.read.call("12/2012").should be_an_instance_of Date
+    end
+  end
+end

data/spec/row_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Cloudsheet::Row do
+  let(:example) {["0", "hi", Date.today.to_s]}
+  context "no map" do
+    subject{Cloudsheet::Row.parse(example)}
+    
+    it "constructs" do
+      subject[0].should eq(example[0])
+      subject[1].should eq(example[1])
+      subject[2].should eq(example[2])
+    end
+
+    specify{subject.count.should eq(example.count)} 
+  end
+
+  context "map" do
+    let(:map) { 
+      map = double("map")
+      map.stub_chain(:[], :name){"name"}
+      map.stub(:read){"data"}
+      map
+    }
+
+    subject{Cloudsheet::Row.parse([0], map)}
+    it "constructs" do
+      subject["name"].should eq("data")
+    end
+
+    specify{subject.count.should eq(1)}
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
+require 'simplecov'
+SimpleCov.start
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'pry'
-require 'Cloudsheet'
+require 'cloudsheet'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudsheet
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -140,9 +140,14 @@ files:
 - VERSION
 - cloudsheet.gemspec
 - lib/cloudsheet.rb
+- lib/cloudsheet/drive.rb
+- lib/cloudsheet/map.rb
 - lib/cloudsheet/mapping.rb
 - lib/cloudsheet/row.rb
+- lib/cloudsheet/sheet.rb
 - spec/drive_spec.rb
+- spec/mapping_spec.rb
+- spec/row_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/kurtisnelson/cloudsheet
 licenses:
@@ -159,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1593865811557726438
+      hash: 2552302486075153280
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: