spectifly 0.0.2 → 0.0.3

data/lib/spectifly/entity.rb

@@ -20,13 +20,20 @@ module Spectifly
           entities[entity.name] = entity
         end
         if presenter_path
-          presenters_glob = File.join(presenter_path, '*.entity')
-          Dir[presenters_glob].each do |path|
-            path = File.expand_path(path)
-            presenter = Spectifly::Entity.parse(path)
-            base_entity = entities[Spectifly::Support.tokenize(presenter.root)]
-            entity = base_entity.present_as(presenter)
-            entities[entity.name] = entity
+          presenters_glob = File.join(presenter_path, '*')
+          Dir[presenters_glob].each do |presenter_list_path|
+            if File.directory? presenter_list_path
+              presenter_name = presenter_list_path.sub(/^#{presenter_path}\//, '')
+              entities[presenter_name] = {}
+              entities_glob = File.join(presenter_list_path, '*.entity')
+              Dir[entities_glob].each do |path|
+                path = File.expand_path(path)
+                presenter = Spectifly::Entity.parse(path)
+                base_entity = entities[Spectifly::Support.tokenize(presenter.root)]
+                entity = base_entity.present_as(presenter)
+                entities[presenter_name][entity.name] = entity
+              end
+            end
           end
         end
         entities
@@ -103,4 +110,4 @@ module Spectifly
       merged_entity
     end
   end
-end
+end

data/lib/spectifly/version.rb

@@ -1,3 +1,3 @@
 module Spectifly
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/tasks/spectifly.rake

@@ -1,11 +1,25 @@
+require 'spectifly/xsd'
+
 namespace :spectifly do
   namespace :xsd do
+    def write_entity(entity, path)
+      File.open(File.join(path, "#{entity.name}.xsd"), 'w') do |f|
+        f.write Spectifly::Xsd::Builder.new(entity).build
+      end
+    end
+
     Spectifly::Task.new('generate_from_entities', [:destination_path]) do |spectifly, args|
       options = File.exist?(spectifly.presenter_path) ? { :presenter_path => spectifly.presenter_path } : {}
 
       Spectifly::Entity.from_directory(spectifly.entity_path, options).each do |name, entity|
-        File.open(File.join(args[:destination_path], "#{name}.xsd"), 'w') do |f|
-          f.write Spectifly::Xsd::Builder.new(entity).build
+        if entity.is_a? Spectifly::Entity
+          write_entity(entity, args[:destination_path])
+        else
+          presenter_path = File.join(args[:destination_path], name)
+          FileUtils.mkdir_p presenter_path unless File.exist? presenter_path
+          entity.each do |presenter_entity_name, presenter_entity|
+            write_entity(presenter_entity, presenter_path)
+          end
         end
       end
     end
@@ -16,7 +30,16 @@ namespace :spectifly do
       end
     end
 
+    Spectifly::Task.new('ensure_presenter_validity', [:destination_path]) do |spectifly, args|
+      # just copy all the xsds over into each presenter directory, for easy zipping and whatnot
+      schema = Dir.glob(File.join(args[:destination_path], '*.xsd'))
+      directories = (Dir.glob(File.join(args[:destination_path], "*")) - schema)
+      directories.each do |path|
+        FileUtils.cp schema, path
+      end
+    end
+
     desc 'Generate all XSDs for the configured entity directory, including extended type definitions'
-    task :generate_all, [:destination_path] => [:generate_from_entities, :generate_extended_types]
+    task :generate_all, [:destination_path] => [:generate_from_entities, :generate_extended_types, :ensure_presenter_validity]
   end
 end

data/spec/spectifly/entity_spec.rb

@@ -17,9 +17,15 @@ describe Spectifly::Entity do
       entities = Spectifly::Entity.from_directory(
         fixture_path, :presenter_path => base_presenter_path
       )
+
       entities.keys.should =~ ['individual', 'group', 'positionless_individual', 'masterless_group']
-      entities.values.map(&:class).uniq.should == [Spectifly::Entity]
-      entities.values.map(&:name).should =~ ['individual', 'group', 'positionless_individual', 'masterless_group']
+      entities['positionless_individual'].keys.should == ['individual']
+      entities['positionless_individual'].values.map(&:name).should == ['individual']
+      entities['masterless_group'].keys.should == ['group']
+      entities['masterless_group'].values.map(&:name).should == ['group']
+      ['positionless_individual', 'masterless_group'].each do |presenter|
+        entities[presenter].values.map(&:class).uniq.should == [Spectifly::Entity]
+      end
     end
   end
 
@@ -59,17 +65,17 @@ describe Spectifly::Entity do
   describe '#name' do
     before :each do
       @presenter_entity = Spectifly::Entity.parse(
-        fixture_path('presenters/positionless_individual')
+        fixture_path('presenters/positionless_individual/individual.entity')
       )
     end
 
     it 'returns name from entity file' do
       @entity.name.should == 'individual'
-      @presenter_entity.name.should == 'positionless_individual'
+      @presenter_entity.name.should == 'individual'
     end
 
     it 'returns presenter name when presented' do
-      @entity.present_as(@presenter_entity).name.should == 'positionless_individual'
+      @entity.present_as(@presenter_entity).name.should == 'individual'
     end
   end
 
@@ -80,7 +86,7 @@ describe Spectifly::Entity do
 
     it 'returns presenter if presented' do
       @presenter_entity = Spectifly::Entity.parse(
-        fixture_path('presenters/positionless_individual')
+        fixture_path('presenters/positionless_individual/individual.entity')
       )
       @entity.present_as(@presenter_entity).presented_as.should == @presenter_entity
     end
@@ -129,7 +135,7 @@ describe Spectifly::Entity do
 
   describe '#present_as' do
     before :each do
-      @presenter_entity = Spectifly::Entity.parse(fixture_path('presenters/positionless_individual'))
+      @presenter_entity = Spectifly::Entity.parse(fixture_path('presenters/positionless_individual/individual'))
     end
 
     it 'raises exception if presenter entity has different root' do

data/spec/spectifly/json/builder_spec.rb

@@ -21,7 +21,7 @@ describe Spectifly::Json::Builder do
   describe '#present_as' do
     it 'filters entity through presenter, and returns self' do
       entity = Spectifly::Entity.parse(fixture_path('individual'))
-      presenter_entity = Spectifly::Entity.parse(fixture_path('presenters/positionless_individual'))
+      presenter_entity = Spectifly::Entity.parse(fixture_path('presenters/positionless_individual/individual'))
       json_path = expectation_path('presented/positionless_individual', 'json')
       builder = described_class.new(entity)
       builder.present_as(presenter_entity).should == builder
@@ -31,7 +31,7 @@ describe Spectifly::Json::Builder do
 
     it 'works with overriding relationships' do
       entity = Spectifly::Entity.parse(fixture_path('group'))
-      presenter_entity = Spectifly::Entity.parse(fixture_path('presenters/masterless_group'))
+      presenter_entity = Spectifly::Entity.parse(fixture_path('presenters/masterless_group/group'))
       json_path = expectation_path('presented/masterless_group', 'json')
       builder = described_class.new(entity)
       builder.present_as(presenter_entity).should == builder
@@ -39,4 +39,4 @@ describe Spectifly::Json::Builder do
       JSON.pretty_generate(hash).should == File.read(json_path)
     end
   end
-end
+end

data/spec/spectifly/xsd/builder_spec.rb

@@ -30,7 +30,7 @@ describe Spectifly::Xsd::Builder do
   describe '#present_as' do
     it 'filters entity through presenter, and returns self' do
       entity = Spectifly::Entity.parse(fixture_path('individual'))
-      presenter_entity = Spectifly::Entity.parse(fixture_path('presenters/positionless_individual'))
+      presenter_entity = Spectifly::Entity.parse(fixture_path('presenters/positionless_individual/individual'))
       xsd_path = expectation_path('presented/positionless_individual', 'xsd')
       builder = Spectifly::Xsd::Builder.new(entity)
       builder.present_as(presenter_entity).should == builder
@@ -40,7 +40,7 @@ describe Spectifly::Xsd::Builder do
 
     it 'works with presented relationship-having entities' do
       entity = Spectifly::Entity.parse(fixture_path('group'))
-      presenter_entity = Spectifly::Entity.parse(fixture_path('presenters/masterless_group'))
+      presenter_entity = Spectifly::Entity.parse(fixture_path('presenters/masterless_group/group'))
       xsd_path = expectation_path('presented/masterless_group', 'xsd')
       builder = Spectifly::Xsd::Builder.new(entity)
       builder.present_as(presenter_entity).should == builder
@@ -48,4 +48,4 @@ describe Spectifly::Xsd::Builder do
       xsd.should == File.read(xsd_path)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectifly
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -178,8 +178,8 @@ files:
 - spec/fixtures/individual.entity
 - spec/fixtures/invalid/multiple_root.entity
 - spec/fixtures/invalid/no_fields.entity
-- spec/fixtures/presenters/masterless_group.entity
-- spec/fixtures/presenters/positionless_individual.entity
+- spec/fixtures/presenters/masterless_group/group.entity
+- spec/fixtures/presenters/positionless_individual/individual.entity
 - spec/spec_helper.rb
 - spec/spectifly/base/builder_spec.rb
 - spec/spectifly/base/entity_node_spec.rb
@@ -207,12 +207,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3903166964616575918
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3903166964616575918
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -233,8 +239,8 @@ test_files:
 - spec/fixtures/individual.entity
 - spec/fixtures/invalid/multiple_root.entity
 - spec/fixtures/invalid/no_fields.entity
-- spec/fixtures/presenters/masterless_group.entity
-- spec/fixtures/presenters/positionless_individual.entity
+- spec/fixtures/presenters/masterless_group/group.entity
+- spec/fixtures/presenters/positionless_individual/individual.entity
 - spec/spec_helper.rb
 - spec/spectifly/base/builder_spec.rb
 - spec/spectifly/base/entity_node_spec.rb
@@ -248,4 +254,3 @@ test_files:
 - spec/spectifly/xsd/field_spec.rb
 - spec/spectifly/xsd/types_spec.rb
 - spec/support/path_helper.rb
-has_rdoc: