data_package 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c32d939169849aa526e542b913a074a24c0d3b5e
-  data.tar.gz: daf0cab3aa5f972ba928b38a0911c27ac09630fe
+  metadata.gz: 9bb5f38b73d7574924c6cc18fe28506566d61228
+  data.tar.gz: b6b2bcd9ab3f67cf3a07422b1f41211c4dfab8da
 SHA512:
-  metadata.gz: e65364b7354d36d78ef635296f962ed17ce46d96baa06055df885419b41e9e3e229d1230de01d26371b0ef90095d74133333a6d8fdfe83def2d45280cce557e8
-  data.tar.gz: 1345fe372c3cbed0a53a933989847804276d6d3cb127eb55f6e042a5e4cf36efc8341b1183801f65c713127daf0e85dee3040f6c364da6fd510b39bd823e94bf
+  metadata.gz: 7322ef232c56454c1d87115f052b051d5744c09a82bb0bd8c96ac8ca61dbc6d6f4cb052cc293f293e4dce6f4dde7ae75bee8a4bfa369ccef6f5e9883ebdeb2a0
+  data.tar.gz: 4c9c3b153fe66838671028afc92126f819a4190e4e46720f1ae901631768f3aeb635c0b2e290d0daa8175b87a841e99d244f6b0791e502c3b96c7d06e8cb29d0

data/data_package.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rcsv'
   spec.add_runtime_dependency 'yajl-ruby'
   spec.add_runtime_dependency 'data_kit'
-  spec.add_runtime_dependency 'active_support'
 
   # Development Dependencies
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/attr_helper/base.rb

@@ -0,0 +1,118 @@
+require 'attr_helper/base_attr'
+require 'attr_helper/required_attr'
+require 'attr_helper/serialization'
+
+module AttrHelper
+  module Base
+    def self.included(klass)
+      klass.send :extend, ClassMethods
+    end
+
+    module ClassMethods
+      def inherited(klass)
+        super
+
+        # we might want to undef here so
+        #  that child classes can override
+
+        unless required_attributes.empty?
+          add_required_attrs(klass)
+        end
+
+        unless optional_attributes.empty?
+          add_optional_attrs(klass)
+        end
+      end
+
+      def attr_optional(name, options = {})
+        optional_attributes << BaseAttr.new(name.to_sym, options)
+        attr_accessor name.to_sym
+      end
+
+      def optional_attributes
+        @optional_attributes ||= []
+      end
+
+      def attr_required(name, options = {})
+        required_attributes << RequiredAttr.new(name.to_sym, options)
+        attr_accessor name.to_sym
+      end
+
+      def required_attributes
+        @required_attributes ||= []
+      end
+
+      private
+
+      def add_required_attrs(klass)
+        required_attributes.each do |attribute|
+          klass.attr_required attribute.name, {
+            :name => attribute.name,
+            :key => attribute.key,
+            :default => attribute.default,
+            :serialize => attribute.serialize,
+            :if => attribute.if_cond,
+            :unless => attribute.unless_cond
+          }
+        end
+      end
+
+      def add_optional_attrs(klass)
+        optional_attributes.each do |attribute|
+          klass.attr_optional attribute.name, {
+            :name => attribute.name,
+            :key => attribute.key,
+            :default => attribute.default,
+            :serialize => attribute.serialize
+          }
+        end
+      end
+    end
+
+    def attributes
+      required_attributes + optional_attributes
+    end
+
+    def required_attributes
+      self.class.required_attributes.select do |attribute|
+        attribute.required?(self)
+      end
+    end
+    
+    def optional_attributes
+      self.class.optional_attributes
+    end
+
+    def missing_attributes
+      required_attributes.select do |attribute|
+        value = send(attribute.name)
+        value.respond_to?(:empty?) ? value.empty? : value.nil?
+      end
+    end
+
+    def attr_required?(name)
+      required_attributes.any?{|a| a.name == name}
+    end
+
+    def attr_missing?(name)
+      missing_attributes.any?{|a| a.name == name}
+    end
+
+    def attr_present?(name)
+      !attr_missing?(name)
+    end
+
+    def write_attribute(name, value)
+      self.instance_variable_set("@#{name}", value)
+    end
+
+    def write_attributes(attrs = {})
+      attrs = DataPackage::Helpers.symbolize_keys(attrs)
+      
+      attributes.each do |attribute|
+        value = attrs[attribute.key.to_sym] || attribute.default
+        self.send("#{attribute.name}=", value) unless value.nil?
+      end
+    end
+  end
+end

data/lib/attr_helper/serialization.rb

@@ -19,7 +19,8 @@ module AttrHelper
     end
 
     def to_json(options = {})
-      Yajl::Encoder.encode(to_hash, options.reverse_merge(:pretty => true))
+      options = {:pretty => true}.merge(options)
+      Yajl::Encoder.encode(to_hash, options)
     end
   end
 end

data/lib/data_package/base.rb

@@ -1,6 +1,6 @@
 module DataPackage
   class Base
-    include AttrHelper
+    include AttrHelper::Base
     include AttrHelper::Serialization
 
     def initialize(attrs = {})

data/lib/data_package/helpers.rb

@@ -0,0 +1,21 @@
+module DataPackage
+  module Helpers
+    class << self
+      # http://devblog.avdi.org/2009/07/14/recursively-symbolize-keys/
+      def symbolize_keys(hash)
+        hash.inject({}){|result, (key, value)|
+          new_key = case key
+                    when String then key.to_sym
+                    else key
+                    end
+          new_value = case value
+                      when Hash then symbolize_keys(value)
+                      else value
+                      end
+          result[new_key] = new_value
+          result
+        }
+      end
+    end
+  end
+end

data/lib/data_package/resource.rb

@@ -21,7 +21,6 @@ module DataPackage
 
     attr_optional :size
     attr_optional :hash
-    attr_optional :last_modified, :key => 'lastModified'
 
     attr_accessor :base_path
 
@@ -38,6 +37,14 @@ module DataPackage
       @dialect = Dialect.new(json)
     end
 
+    #
+    # Future Note:
+    #   For remote resources we should have a path *and* a url
+    #   If the path is a file on disk then use it, otherwise assume
+    #   that the path is a pointer to the destination of the URL data
+    #   this makes it possible for scripts to rely on a file location
+    #
+
     def each_row(&block)
       case data_source_type
       when :data

data/lib/data_package/version.rb

@@ -1,3 +1,3 @@
 module DataPackage
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/data_package.rb

@@ -1,9 +1,10 @@
-require 'active_support/core_ext/hash'
-
 require "data_package/version"
 
 # Attribute Helpers
-require 'attr_helper'
+require 'attr_helper/base'
+
+# Ruby Helpers
+require 'data_package/helpers'
 
 # Core Specification
 require 'data_package/base'
@@ -14,4 +15,4 @@ require 'data_package/resource'
 require 'data_package/dialect'
 require 'data_package/person'
 require 'data_package/source'
-require 'data_package/license'
+require 'data_package/license'

data/spec/klass_helper.rb

@@ -1,6 +1,6 @@
 module KlassHelper
   class BaseKlass
-    include AttrHelper
+    include AttrHelper::Base
     include AttrHelper::Serialization
     
     attr_required :name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_package
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Mode Analytics
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcsv
@@ -52,20 +52,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: active_support
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +123,7 @@ files:
 - README.md
 - Rakefile
 - data_package.gemspec
-- lib/attr_helper.rb
+- lib/attr_helper/base.rb
 - lib/attr_helper/base_attr.rb
 - lib/attr_helper/required_attr.rb
 - lib/attr_helper/serialization.rb
@@ -145,6 +131,7 @@ files:
 - lib/data_package/base.rb
 - lib/data_package/dialect.rb
 - lib/data_package/field.rb
+- lib/data_package/helpers.rb
 - lib/data_package/license.rb
 - lib/data_package/package.rb
 - lib/data_package/person.rb

data/lib/attr_helper.rb

@@ -1,115 +0,0 @@
-require 'attr_helper/base_attr'
-require 'attr_helper/required_attr'
-require 'attr_helper/serialization'
-
-module AttrHelper
-  def self.included(klass)
-    klass.send :extend, ClassMethods
-  end
-
-  module ClassMethods
-    def inherited(klass)
-      super
-
-      # we might want to undef here so
-      #  that child classes can override
-
-      unless required_attributes.empty?
-        add_required_attrs(klass)
-      end
-
-      unless optional_attributes.empty?
-        add_optional_attrs(klass)
-      end
-    end
-
-    def attr_optional(name, options = {})
-      optional_attributes << BaseAttr.new(name.to_sym, options)
-      attr_accessor name.to_sym
-    end
-
-    def optional_attributes
-      @optional_attributes ||= []
-    end
-
-    def attr_required(name, options = {})
-      required_attributes << RequiredAttr.new(name.to_sym, options)
-      attr_accessor name.to_sym
-    end
-
-    def required_attributes
-      @required_attributes ||= []
-    end
-
-    private
-
-    def add_required_attrs(klass)
-      required_attributes.each do |attribute|
-        klass.attr_required attribute.name, {
-          :name => attribute.name,
-          :key => attribute.key,
-          :default => attribute.default,
-          :serialize => attribute.serialize,
-          :if => attribute.if_cond,
-          :unless => attribute.unless_cond
-        }
-      end
-    end
-
-    def add_optional_attrs(klass)
-      optional_attributes.each do |attribute|
-        klass.attr_optional attribute.name, {
-          :name => attribute.name,
-          :key => attribute.key,
-          :default => attribute.default,
-          :serialize => attribute.serialize
-        }
-      end
-    end
-  end
-
-  def attributes
-    required_attributes + optional_attributes
-  end
-
-  def required_attributes
-    self.class.required_attributes.select do |attribute|
-      attribute.required?(self)
-    end
-  end
-  
-  def optional_attributes
-    self.class.optional_attributes
-  end
-
-  def missing_attributes
-    required_attributes.select do |attribute|
-      value = send(attribute.name)
-      value.respond_to?(:empty?) ? value.empty? : value.nil?
-    end
-  end
-
-  def attr_required?(name)
-    required_attributes.any?{|a| a.name == name}
-  end
-
-  def attr_missing?(name)
-    missing_attributes.any?{|a| a.name == name}
-  end
-
-  def attr_present?(name)
-    !attr_missing?(name)
-  end
-
-  def write_attribute(name, value)
-    self.instance_variable_set("@#{name}", value)
-  end
-
-  def write_attributes(attrs = {})
-    attrs = attrs.symbolize_keys
-    attributes.each do |attribute|
-      value = attrs[attribute.key.to_sym] || attribute.default
-      self.send("#{attribute.name}=", value) unless value.nil?
-    end
-  end
-end