hydrogen 0.0.1.pre.alpha.1 → 0.0.1.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e83ee62c3466aeb5e29e83d7b94ccb2ff22a433c
-  data.tar.gz: a7f8bd4b6f0a1b81bb051f0906cac0e7df959434
+  metadata.gz: 5adacfabdf0b193a3f2c27314037eeacfbcd7eee
+  data.tar.gz: 8949722079c63501ebdca86ed9330943d258ec3f
 SHA512:
-  metadata.gz: 3b3c2665434e1a82fa4875057c5262d8a171a1248b14130ebee3881e27e26a81163e3cb83fdb392b3789692691540887fc5b8d88dde105a7f5da67df2d6951e0
-  data.tar.gz: edc468f7b263b766fce594625b4649e86723ec197e5be8575224c84e495eed79c009a5d50cd4a277faf22d92c7fb8728671ed20248ea469f7f3a133dde677553
+  metadata.gz: 3a612a9edaa18125412dafbc691f4ffe2161f1a3b6788732ff77cd95d988bb1a2b76186c727f37459e03bd726f8e696ce7f43b01db88d9df14d007663864476a
+  data.tar.gz: be8dc7f13f64f39bbe733d39a9f1a0c32f5642b6aa74b96f57f36b96fafa2bb322c2ecb727b0b10c598d92d7ec914ddfadda25e972fa56f23d0b5f3ba927dd7b

data/hydrogen.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'test-unit', "~> 3"
   spec.add_development_dependency 'mocha', "~> 1"
   spec.add_development_dependency 'simplecov', "~> 0"
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
 end

data/lib/hydrogen.rb

@@ -1,10 +1,31 @@
+require 'logger'
+
 require "hydrogen/model"
 require "hydrogen/table_object"
-require "hydrogen/table_object/part"
-require "hydrogen/table_object/part/sequence"
-require "hydrogen/aws/table_object"
+require "hydrogen/table_object/collection"
 require "hydrogen/version"
 
 module Hydrogen
-  # Your code goes here...
+  module_function
+  def logger
+    return @logger if @logger
+
+    @logger = Logger.new(STDOUT)
+    @logger.formatter = proc { |severity, datetime, progname, msg| 
+      "[#{datetime}, #{severity}] #{msg}\n"
+    }
+    @logger
+  end
+
+  def logger=(logger)
+    @logger = logger
+  end
+
+  def env
+    @_env ||= ActiveSupport::StringInquirer.new(ENV["QUASAR_ENV"] || ENV["RAILS_ENV"] || "development")
+  end
+
+  def env=(environment)
+    @_env = ActiveSupport::StringInquirer.new(environment)
+  end
 end

data/lib/hydrogen/model.rb

@@ -3,10 +3,11 @@ module Hydrogen
     def initialize(config)
       @table_name = config[:table_name]
       @columns = config[:columns]
+      @key = config[:key]
       @partition = config[:partition] || false
     end
 
-    attr_reader :table_name, :columns
+    attr_reader :table_name, :columns, :key
 
     def name
       @table_name

data/lib/hydrogen/table_object.rb

@@ -1,11 +1,30 @@
-require 'hydrogen/table_object/base'
-require 'hydrogen/table_object/part/sequence'
+require 'hydrogen/model'
 
 module Hydrogen
   class TableObject
-    include Hydrogen::TableObject::Base
-    def initialize(model)
-      super
+    def initialize(model, uri)
+      unless model.kind_of?(Hydrogen::Model)
+        raise "#{model.inspect} is not a valid model to get thrown."
+      end
+      @model = model
+      @uri = uri
+    end
+
+    attr_reader :uri
+    alias_method :url, :uri
+
+    def columns
+      @model.columns
+    end
+
+    def name
+      @model.name
+    end
+
+    def path
+      Hydrogen.logger.warn("Hydrogen::TableObject#path is deprecated. Please use #url.")
+      Hydrogen.logger.debug("Called by #{caller.join("\n")}")
+      url
     end
   end
 end

data/lib/hydrogen/table_object/collection.rb

@@ -1,39 +1,28 @@
 module Hydrogen
   class TableObject
-    module Collection
-      def initialize(model, parts)
+    class Collection
+      def initialize(model, root, parts)
         @model = model
+        @root = root
         @parts = parts
       end
 
       attr_reader :parts
 
-      def path
-        "#{@model.name}/#{@model.name}"
+      def partition?
+        @model.partition?
       end
 
-      def url
-        raise NotImplementedError
+      def name
+        @model.name
       end
 
-      class Builder
-        def initialize(model, sequencer)
-          @model = model
-          @sequencer = sequencer
-        end
-
-        def write(data)
-          @sequencer.write(data)
-        end
-
-        def finalize
-          @sequencer.finalize
-          klass = @sequencer.collection
-
-          puts klass
+      def columns
+        @model.columns
+      end
 
-          klass.new(@model, @sequencer.parts)
-        end
+      def url
+        @root
       end
     end
   end

data/lib/hydrogen/table_object/model_attributes.rb

@@ -0,0 +1,17 @@
+module Hydrogen
+  class TableObject
+    module ModelAttributes
+      def partition?
+        @model.partition?
+      end
+
+      def name
+        @model.name
+      end
+
+      def columns
+        @model.columns
+      end
+    end
+  end
+end

data/lib/hydrogen/version.rb

@@ -1,3 +1,3 @@
 module Hydrogen
-  VERSION = "0.0.1-alpha.1"
+  VERSION = "0.0.1-alpha.3"
 end

data/test/integration/hydrogen_test.rb

@@ -13,18 +13,18 @@ class Hydrogen::IntegrationTest < Test::Unit::TestCase
 
   end
   test "singular" do
-    to = Hydrogen::TableObject.new(@model)
+    to = Hydrogen::TableObject.new(@model, URI("file://tmp/foo/bar.csv.gz"))
 
-    assert_equal to.path, "foo/foo.psv.gz"
+    assert_equal to.url, URI("file://tmp/foo/bar.csv.gz")
   end
 
   test "parts" do
     parts = 5.times.map do |x|
-      Hydrogen::TableObject::Part.new(x, @model)
+      Hydrogen::TableObject.new(@model, URI("file://tmp/foo/bar.csv.gz"))
     end
 
-    sequence = Hydrogen::TableObject::Part::Sequence.new(@model, parts)
+    sequence = Hydrogen::TableObject::Collection.new(@model, URI("file://tmp/foo"), parts)
 
-    assert_equal sequence.path, "foo/foo"
+    assert_equal sequence.url, URI("file://tmp/foo")
   end
 end

data/test/integration/test_helper.rb

@@ -1,7 +1,16 @@
+require 'coveralls'
+
 if ENV["ENABLE_SIMPLE_COV"]
   require 'simplecov'
-  require File.expand_path('../../simplecov_helper', __FILE__)
-  SimpleCov.start 'hydrogen'
+  SimpleCov.start do
+    add_group "Lib", "lib"
+    add_filter "/test/"
+    command_name "Integration Tests"
+    formatter SimpleCov::Formatter::MultiFormatter[
+      SimpleCov::Formatter::HTMLFormatter,
+      Coveralls::SimpleCov::Formatter
+    ]
+  end
 end
 
 require 'test/unit'

data/test/unit/hydrogen/table_object_test.rb

@@ -8,8 +8,12 @@ class Hydrogen::TableObjectTest < Test::Unit::TestCase
     @mock_table_object = mock
     @mock_table_object_name = "mock_table_name"
 
-    @mock_table_object.expects(:name).returns(@mock_table_object_name)
+    @mock_table_object.expects(:kind_of?).with(Hydrogen::Model).returns(true)
+    uri = URI("file:///tmp/foo")
 
-    @table_object = Hydrogen::TableObject.new(@mock_table_object)
+    @table_object = Hydrogen::TableObject.new(@mock_table_object, uri)
+  end
+  test "#url" do
+    @table_object.url
   end
 end

data/test/unit/test_helper.rb

@@ -1,10 +1,16 @@
 require 'coveralls'
-Coveralls.wear!
 
 if ENV["ENABLE_SIMPLE_COV"]
   require 'simplecov'
-  require File.expand_path('../../simplecov_helper', __FILE__)
-  SimpleCov.start 'hydrogen'
+  SimpleCov.start do
+    add_group "Lib", "lib"
+    add_filter "/test/"
+    command_name "Unit Tests"
+    formatter SimpleCov::Formatter::MultiFormatter[
+      SimpleCov::Formatter::HTMLFormatter,
+      Coveralls::SimpleCov::Formatter
+    ]
+  end
 end
 
 require 'test/unit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydrogen
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.alpha.1
+  version: 0.0.1.pre.alpha.3
 platform: ruby
 authors:
 - Ed Carrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -96,19 +96,14 @@ files:
 - Rakefile
 - hydrogen.gemspec
 - lib/hydrogen.rb
-- lib/hydrogen/aws/table_object.rb
 - lib/hydrogen/model.rb
 - lib/hydrogen/table_object.rb
-- lib/hydrogen/table_object/base.rb
 - lib/hydrogen/table_object/collection.rb
-- lib/hydrogen/table_object/part.rb
-- lib/hydrogen/table_object/part/sequence.rb
+- lib/hydrogen/table_object/model_attributes.rb
 - lib/hydrogen/version.rb
 - test/integration/hydrogen_test.rb
 - test/integration/test_helper.rb
-- test/unit/hydrogen/table_object/base_test.rb
-- test/unit/hydrogen/table_object/part/sequence_test.rb
-- test/unit/hydrogen/table_object/part_test.rb
+- test/unit/hydrogen/table_object/collection_test.rb
 - test/unit/hydrogen/table_object_test.rb
 - test/unit/test_helper.rb
 homepage: https://github.com/azanar/hydrogen
@@ -138,8 +133,6 @@ summary: Common elements to the Quasar toolchain of gems
 test_files:
 - test/integration/hydrogen_test.rb
 - test/integration/test_helper.rb
-- test/unit/hydrogen/table_object/base_test.rb
-- test/unit/hydrogen/table_object/part/sequence_test.rb
-- test/unit/hydrogen/table_object/part_test.rb
+- test/unit/hydrogen/table_object/collection_test.rb
 - test/unit/hydrogen/table_object_test.rb
 - test/unit/test_helper.rb

data/lib/hydrogen/aws/table_object.rb

@@ -1,18 +0,0 @@
-module Hydrogen
-  module AWS
-    class TableObject
-      def initialize(table_object)
-        @table_object = table_object
-      end
-
-      def path
-        @table_object.path
-      end
-
-      def url
-        @table_object.url
-      end
-    end
-  end
-end
-

data/lib/hydrogen/table_object/base.rb

@@ -1,24 +0,0 @@
-module Hydrogen
-  class TableObject
-    module Base
-      def initialize(model)
-        if model.kind_of?(Hydrogen::TableObject::Base)
-          raise
-        end
-        @model = model
-      end
-
-      def columns
-        @model.columns
-      end
-
-      def name
-        @model.name
-      end
-
-      def path
-        @path ||= "#{@model.name}/#{name}.psv.gz"
-      end
-    end
-  end
-end

data/lib/hydrogen/table_object/part.rb

@@ -1,19 +0,0 @@
-require 'hydrogen/table_object/base'
-
-module Hydrogen
-  class TableObject
-    # A TableObject::Part behaves like a TableObject, but represent a part
-    # of a sequence of TableObjects
-    class Part
-      include Hydrogen::TableObject::Base
-      def initialize(chunk, model)
-        @chunk = chunk
-        super(model)
-      end
-
-      def name
-        "#{super}.#{@chunk}"
-      end
-    end
-  end
-end

data/lib/hydrogen/table_object/part/sequence.rb

@@ -1,46 +0,0 @@
-require 'hydrogen/table_object/part'
-
-module Hydrogen
-  class TableObject
-    class Part
-      class Sequence
-        include Enumerable
-        def initialize(model, parts, opts = {})
-          unless model.kind_of?(Hydrogen::Model)
-            raise
-          end
-          @model = model
-          @parts = parts
-        end
-
-        def parts
-          @parts
-        end
-
-        def num_parts
-          @parts.length
-        end
-
-        def each
-          @parts.each {|p| yield p}
-        end
-
-        def name
-          @model.name
-        end
-
-        def columns
-          @model.columns
-        end
-
-        def partition?
-          @model.partition?
-        end
-
-        def path
-          "#{name}/#{name}"
-        end
-      end
-    end
-  end
-end

data/test/unit/hydrogen/table_object/base_test.rb

@@ -1,32 +0,0 @@
-require File.expand_path('../../../test_helper', __FILE__)
-
-require 'hydrogen/table_object/base'
-
-class Hydrogen::TableObject::Base::Test < Test::Unit::TestCase
-  include TestHelper 
-  setup do
-    @mock_table_object = mock
-    @mock_table_object_name = "mock_table_name"
-
-    mock_table_object_klass = Class.new do
-      include Hydrogen::TableObject::Base
-    end
-
-    @table_object = mock_table_object_klass.new(@mock_table_object)
-  end
-
-  test "#path" do
-    @mock_table_object.expects(:name).twice.returns(@mock_table_object_name)
-    @table_object.path
-  end
-
-  test "#path should cache" do
-    @mock_table_object.expects(:name).twice.returns(@mock_table_object_name)
-    anterior = @table_object.path
-
-    posterior = @table_object.path
-
-    assert_equal anterior, posterior
-  end
-end
-

data/test/unit/hydrogen/table_object/part/sequence_test.rb

@@ -1,22 +0,0 @@
-require File.expand_path('../../../../test_helper', __FILE__)
-
-require 'hydrogen/table_object/part/sequence'
-
-class Hydrogen::TableObject::Part::Sequence::Test < Test::Unit::TestCase
-  include TestHelper 
-  setup do
-    @mock_table_object = mock
-    @mock_table_object_name = "mock_table_name"
-
-    @mock_parts = 5.times.map { mock }
-
-    @sequence = Hydrogen::TableObject::Part::Sequence.new(@mock_table_object, @mock_parts)
-  end
-
-  test "#parts" do
-    #@mock_table_object.expects(:name).twice.returns(@mock_table_object_name)
-
-    assert_equal @sequence.parts, @mock_parts
-  end
-end
-

data/test/unit/hydrogen/table_object/part_test.rb

@@ -1,31 +0,0 @@
-require File.expand_path('../../../test_helper', __FILE__)
-
-require 'hydrogen/table_object/part'
-
-class Hydrogen::TableObject::Part::Test < Test::Unit::TestCase
-  include TestHelper 
-  setup do
-    @mock_table_object = mock
-    @mock_table_object_name = "mock_table_name"
-
-    @table_object = Hydrogen::TableObject::Part.new(1, @mock_table_object)
-  end
-
-  test "#path" do
-    @mock_table_object.expects(:name).twice.returns(@mock_table_object_name)
-    res = @table_object.path
-
-    assert_equal res, 'mock_table_name/mock_table_name.1.psv.gz'
-  end
-
-  test "#path should cache" do
-    @mock_table_object.expects(:name).twice.returns(@mock_table_object_name)
-    anterior = @table_object.path
-
-    posterior = @table_object.path
-
-    assert_equal anterior, posterior
-  end
-end
-
-