conglomerate 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e7f86dfe40e6fc92f0c38175855edca70ef07ae
-  data.tar.gz: 91f29ea288d44987d94e0538c88a6ad20e84767f
+  metadata.gz: c2c95c7a91ce4333ee2a9301b1b284767a3e6ed8
+  data.tar.gz: 8abe345a90637675d59b04694983788786a48a04
 SHA512:
-  metadata.gz: ed8a22876ae473586c0c47f69c84b945b9537adbb93ca037d3b1ccaf9fafbd74d84efb9642afc9fdb2a888b0b8082365c72a55da7d70bac0327da609421f99c0
-  data.tar.gz: c92c82fe723c88ff6ba1d17d3e07525efd2f847e9b1f34eb17de17f3b53bfd04a9f8f365854877e4881b7beb2812242d29f6a76d71d1a1e313c7865a947092ba
+  metadata.gz: 248bfbc02447751ca4340211f07a6dcc7853ca73100b4fa5b92331563173496188eda3f39a023cbbf8499e4692f46467ef7dae98b17982c0002d3bc65b02267a
+  data.tar.gz: 61bca009ebf37f1a5fb42aacf03790dfce70b31948bba07f9697a6e9ca6c27ef46567cb3e7826f2851d6f72d8ce1d4dde20ce401a0f0d1560d4ee96c7ddf4dbf

data/conglomerate.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0.0.beta1"
+
+  spec.required_ruby_version = '>= 1.9.3'
 end

data/lib/conglomerate.rb

@@ -12,10 +12,8 @@ require_relative "conglomerate/command"
 require_relative "conglomerate/collection"
 require_relative "conglomerate/tree_deserializer"
 require_relative "conglomerate/root"
-
 require_relative "conglomerate/mixin_ivar_helper"
 require_relative "conglomerate/builder_call"
-
 require_relative "conglomerate/builder_serializer"
 require_relative "conglomerate/particle_builder"
 require_relative "conglomerate/link_builder"

data/lib/conglomerate/builder_call.rb

@@ -2,13 +2,16 @@ module Conglomerate
   class BuilderCall
     attr_accessor :name, :opts, :block, :builder, :array, :iterates
 
-    def initialize(name: nil, opts: {}, block:, builder:, array:, iterates:)
-      self.name = name
-      self.opts = opts
-      self.block = block
-      self.builder = builder
-      self.array = array
-      self.iterates = iterates
+    def initialize(options = {})
+      self.name = options.fetch(:name, nil)
+      self.opts = options.fetch(:opts, {})
+      self.block = options.fetch(:block)
+      self.builder = options.fetch(:builder)
+      self.array = options.fetch(:array)
+      self.iterates = options.fetch(:iterates)
+
+    rescue KeyError => e
+      raise ArgumentError, e.message.gsub("key not found", "missing argument")
     end
 
     def run(context, objects, attrs, attr_name)

data/lib/conglomerate/builder_serializer.rb

@@ -4,10 +4,10 @@ module Conglomerate
 
     mi_ivar_accessor :objects, :context, :_builder_name
 
-    def initialize(objects, name: nil, context: nil)
+    def initialize(objects, options = {})
       self.objects = [*objects].compact
-      self.context = context
-      self._builder_name = name.to_s
+      self.context = options.fetch(:context, nil)
+      self._builder_name = options.fetch(:name, nil).to_s
     end
 
     def build(attrs = {})

data/lib/conglomerate/particle.rb

@@ -41,11 +41,20 @@ module Conglomerate
 
       private
 
-      def array(attr, contains: nil, cull: true)
+      def array(attr, options = {})
+        contains = options.fetch(:contains, nil)
+        cull = options.fetch(:cull, true)
+
         attribute(attr, :type => :array, :contains => contains, :cull => cull)
       end
 
-      def attribute(attr, default: nil, type: nil, contains: nil, cull: true, required: nil)
+      def attribute(attr, options = {})
+        default = options.fetch(:default, nil)
+        type = options.fetch(:type, nil)
+        contains = options.fetch(:contains, nil)
+        cull = options.fetch(:cull, true)
+        required = options.fetch(:required, nil)
+
         instance_variable_get("@attributes")[attr] = {
           :default => default,
           :type => type,

data/lib/conglomerate/serializer.rb

@@ -4,9 +4,9 @@ module Conglomerate
       descendant.extend(ClassMethods)
     end
 
-    def initialize(objects, context: nil)
+    def initialize(objects, options = {})
       self.objects = [*objects].compact
-      self.context = context
+      self.context = options.fetch(:context, nil)
     end
 
     def serialize
@@ -29,7 +29,10 @@ module Conglomerate
       collection.merge({"version" => "1.0"})
     end
 
-    def apply_href(collection, proc: self.class._href, object: nil)
+    def apply_href(collection, options = {})
+      proc = options.fetch(:proc, self.class._href)
+      object = options.fetch(:object, nil)
+
       if proc
         if object
           collection.merge({"href" => context.instance_exec(object, &proc)})
@@ -41,10 +44,12 @@ module Conglomerate
       end
     end
 
-    def apply_data(
-      collection, data: [], object: nil, default_value: nil,
-      build_template: false
-    )
+    def apply_data(collection, options = {})
+      data = options.fetch(:data, [])
+      object = options.fetch(:object, nil)
+      default_value = options.fetch(:default_value, nil)
+      build_template = options.fetch(:build_template, false)
+
       data = data.map do |datum|
         name = datum[:name]
         type = datum.fetch(:type, :value)
@@ -141,7 +146,10 @@ module Conglomerate
       end
     end
 
-    def apply_links(collection, links: self.class._links, object: nil)
+    def apply_links(collection, options = {})
+      links = options.fetch(:links, self.class._links)
+      object = options.fetch(:object, nil)
+
       if object && !links.empty?
         links = links.map do |link|
           if !link.has_key?(:name) || present?(object.send(link[:name]))
@@ -187,12 +195,19 @@ module Conglomerate
       apply_data(command, :data => data, :default_value => "")
     end
 
-    def build_item_link(rel, proc: nil, object: nil)
+    def build_item_link(rel, options = {})
+      proc = options.fetch(:proc, nil)
+      object = options.fetch(:object, nil)
+
       link = {"rel" => rel.to_s}
       apply_href(link, :proc => proc, :object => object)
     end
 
-    def sanitize_value(object, name:, type: :value, default_value: nil)
+    def sanitize_value(object, options = {})
+      name = options.fetch(:name)
+      type = options.fetch(:type, :value)
+      default_value = options.fetch(:default_value, nil)
+
       if object.nil? || object.send(name).nil?
         if type == :array
           []
@@ -240,7 +255,9 @@ module Conglomerate
         self._item_href = block
       end
 
-      def query(rel, data: [], &block)
+      def query(rel, options = {}, &block)
+        data = options.fetch(:data, [])
+
         data = [*data]
         data = data.map { |datum| {:name => datum} }
         self._queries = self._queries << {
@@ -248,7 +265,10 @@ module Conglomerate
         }
       end
 
-      def command(rel, data: [], prompt: nil, &block)
+      def command(rel, options = {}, &block)
+        data = options.fetch(:data, [])
+        prompt = options.fetch(:prompt, nil)
+
         data = [*data]
         data = data.map { |datum| {:name => datum} }
         self._commands = self._commands << {
@@ -256,9 +276,12 @@ module Conglomerate
         }
       end
 
-      def attribute(
-        name, template: false, rel: nil, type: :value, prompt: nil, &block
-      )
+      def attribute(name, options = {}, &block)
+        template = options.fetch(:template, false)
+        rel = options.fetch(:rel, nil)
+        type = options.fetch(:type, :value)
+        prompt = options.fetch(:prompt, nil)
+
         self._attributes = self._attributes << {
           :name => name, :template => template, :rel => rel, :type => type,
           :prompt => prompt, :block => block
@@ -277,7 +300,10 @@ module Conglomerate
         }
       end
 
-      def template(name, type: :value, prompt: nil)
+      def template(name, options = {})
+        type = options.fetch(:type, :value)
+        prompt = options.fetch(:prompt, nil)
+
         self._templates = self._templates << {
           :name => name, :type => type, :prompt => prompt, :template => true
         }

data/lib/conglomerate/version.rb

@@ -1,3 +1,3 @@
 module Conglomerate
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

data/spec/builder_call_spec.rb

@@ -0,0 +1,14 @@
+require_relative "spec_helper"
+require_relative "../lib/conglomerate"
+
+describe Conglomerate::BuilderCall do
+  let(:builder_call) {
+    Conglomerate::BuilderCall.new
+  }
+
+  context "required arguments" do
+    specify "block" do
+      expect { builder_call }.to raise_error(ArgumentError)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conglomerate
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Shane Emmons
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-26 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,6 +95,7 @@ files:
 - lib/conglomerate/tree_deserializer.rb
 - lib/conglomerate/tree_serializer.rb
 - lib/conglomerate/version.rb
+- spec/builder_call_spec.rb
 - spec/collection_spec.rb
 - spec/command_ext_spec.rb
 - spec/command_spec.rb
@@ -119,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -132,6 +133,7 @@ signing_key:
 specification_version: 4
 summary: A library to serialize Ruby objects into collection+json
 test_files:
+- spec/builder_call_spec.rb
 - spec/collection_spec.rb
 - spec/command_ext_spec.rb
 - spec/command_spec.rb
@@ -144,3 +146,4 @@ test_files:
 - spec/query_spec.rb
 - spec/spec_helper.rb
 - spec/tree_deserializer_spec.rb
+has_rdoc: