data_package 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdd1a91b8d504a0069e01f3289f4e374db9be84e
-  data.tar.gz: d80447fed17c1ad21c7e9982ce0b94d15b1c4587
+  metadata.gz: c32d939169849aa526e542b913a074a24c0d3b5e
+  data.tar.gz: daf0cab3aa5f972ba928b38a0911c27ac09630fe
 SHA512:
-  metadata.gz: b1de349cf66bb2550dbc193ea4ed1a82288ddb665da608a7c1a1fcfa22f4accc9a068fef268929a1a7d2f83f78fb4a61c0278b46fdfb840e0f879d9a0c23fba7
-  data.tar.gz: 3f002d0d49864cd05cdc6cb14116f862665a91fb6d34621e5489f7f85cfdbc737a277acb306b4d3aa48562f15d1ca495384a27d3a786b15bcc3832fb797373f1
+  metadata.gz: e65364b7354d36d78ef635296f962ed17ce46d96baa06055df885419b41e9e3e229d1230de01d26371b0ef90095d74133333a6d8fdfe83def2d45280cce557e8
+  data.tar.gz: 1345fe372c3cbed0a53a933989847804276d6d3cb127eb55f6e042a5e4cf36efc8341b1183801f65c713127daf0e85dee3040f6c364da6fd510b39bd823e94bf

data/README.md

@@ -7,6 +7,7 @@ Library of classes and utilities for reading and writing data packages
 
 #### Usage
 
+```
 attr_required :name
 attr_required :path, :if => lamda {|obj|
   obj.attr_missing?(:url) && obj.attr_missing?(:data)
@@ -15,18 +16,20 @@ attr_required :path, :if => lamda {|obj|
 attr_optional :title
 attr_optional :sources, :default => [], :key => 'sources',
   :serialize => lambda { |source| source.collect(&:to_hash) }
+```
 
 key is not required for attr_optional as it defaults to name of the attribute
 
 #### Instance Methods
 
+```
 required_attrs => [...]
 optional_attrs => [...]
-serializable_attrs => [...]
+```
 
+```
 attr_required?(attr_name) #=> boolean
-
-valid? #=> boolean, Are all required fields present?
-
 attr_missing?(attr_name) #=> boolean
-attr_present?(attr_name) #=> boolean
+attr_present?(attr_name) #=> boolean
+valid? #=> boolean, Are all required fields present?
+```

data/lib/attr_helper.rb

@@ -15,27 +15,11 @@ module AttrHelper
       #  that child classes can override
 
       unless required_attributes.empty?
-        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
+        add_required_attrs(klass)
       end
 
       unless optional_attributes.empty?
-        optional_attributes.each do |attribute|
-          klass.attr_optional attribute.name, {
-            :name => attribute.name,
-            :key => attribute.key,
-            :default => attribute.default,
-            :serialize => attribute.serialize
-          }
-        end
+        add_optional_attrs(klass)
       end
     end
 
@@ -56,6 +40,32 @@ module AttrHelper
     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

data/lib/data_package/field.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module DataPackage
   class Field < Base
     Types = Set.new([

data/lib/data_package/package.rb

@@ -6,7 +6,6 @@ module DataPackage
     attr_optional :title
     attr_optional :version
     attr_optional :description
-    attr_optional :last_modified
     attr_optional :datapackage_version
 
     attr_optional :sources, :serialize => Proc.new { |source|
@@ -33,6 +32,13 @@ module DataPackage
 
     def initialize(base_path, attrs = {})
       @base_path = base_path
+
+      @resources ||= []
+      @sources ||= []
+      @licenses ||= []
+      @maintainters ||= []
+      @contributors ||= []
+
       super(attrs)
     end
 

data/lib/data_package/resource.rb

@@ -43,6 +43,8 @@ module DataPackage
       when :data
         data.each(&block)
       when :path
+        file_path = File.join(base_path, path)
+        
         case format
         when 'csv'
           DataKit::CSV::Parser.new(file_path).each_row(&block)
@@ -56,19 +58,6 @@ module DataPackage
       end
     end
 
-    def file_path
-      case data_source_type
-      when :data
-        nil # do something here
-      when :path
-        File.join(base_path, path) # do something here
-      when :url
-        raise "URL based resources are not yet supported"
-      else
-        raise "Resources require one of data, path or url keys to be specified"
-      end
-    end
-
     private
 
     def data_source_type

data/lib/data_package/schema.rb

@@ -6,6 +6,12 @@ module DataPackage
 
     attr_optional :primary_key, :key => 'primaryKey'
 
+    def initialize(attrs = {})
+      @fields ||= []
+      
+      super(attrs)
+    end
+
     def fields=(json)
       @fields = json.collect{|f| Field.new(f)}
     end

data/lib/data_package/version.rb

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

data/spec/data_package/package_spec.rb

@@ -14,7 +14,7 @@ describe DataPackage::Package do
 
     package.name.should == 'mypackage'
     package.version.should == '0.0.1'
-    package.resources.should == nil
+    package.resources.should == []
     package.base_path.should == tmpdir
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_package
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mode Analytics
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcsv