alephant 0.0.9.1-java → 0.0.9.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c24d2103f3e0adabbcd97061f018466aefcb676b
-  data.tar.gz: 6ec7568bfeec69d965f8dcada5ff5f50a9ce3b7f
+  metadata.gz: 6716ed6da6972be045f19e4ee574a719bbe637e3
+  data.tar.gz: 7e2c247eebaa860b20b2594451a922be357341e5
 SHA512:
-  metadata.gz: ad2e5a77b52ec167642c212995c6996cd52fd903b694f9968a7dfcf55c67c8b5c19b50755fe040960b1959f4b7f56dbea0ab670da2805ceb5ca211a06e3b0a32
-  data.tar.gz: a971cefb397f3ec3badaf4cb532b9b0798cd2a63b5976981047910cbe0b02ab65b7bde175b6b50b0e558169be7fe58b01f5e6233f71f254c844e0b444ccdb05f
+  metadata.gz: 11ccd5ae937a3e19cd6c31319dc7f922763fc129425c4102eb1513fbecf8fe5e6584187cdc9ca9e408ab1d520a0cd5ba4a725bc969e1e93a726b67b43be1336b
+  data.tar.gz: 79f418dcd1f62dd7d8b5360a176331d2e8c475c6e61260287c2e97bc9bf017487de442b2222b21fe459e0cd829b5a0b87d2ef1a2232658e3ce0364d9f44fd9c2

data/lib/alephant.rb

@@ -18,7 +18,6 @@ module Alephant
     attr_reader :sequencer, :queue, :cache, :renderer
 
     VALID_OPTS = [
-      :model_file,
       :s3_bucket_id,
       :s3_object_path,
       :s3_object_id,
@@ -44,7 +43,7 @@ module Alephant
 
       @queue = Queue.new(@sqs_queue_id)
       @cache = Cache.new(@s3_bucket_id, @s3_object_path)
-      @multi_renderer = MultiRenderer.new(@model_file, "#{@view_path}/#{@component_id}")
+      @multi_renderer = MultiRenderer.new(@component_id, @view_path)
       @parser = Parser.new
     end
 

data/lib/alephant/models/multi_renderer.rb

@@ -2,9 +2,9 @@ module Alephant
   class MultiRenderer
     DEFAULT_LOCATION = 'components'
 
-    def initialize(model_file, view_base_path=nil)
-      self.base_path = view_base_path unless view_base_path.nil?
-      @model_file = model_file
+    def initialize(component_id, view_base_path=nil)
+      self.base_path = "#{view_base_path}/#{component_id}" unless view_base_path.nil?
+      @component_id = component_id
       @logger = ::Alephant.logger
     end
 
@@ -17,63 +17,59 @@ module Alephant
     end
 
     def render(data)
-      instance = create_instance(data)
-
       template_locations.reduce({}) do |obj, file|
         template_id = template_id_for file
+
         obj.tap do |o|
           o[template_id.to_sym] = render_template(
             template_id,
-            data,
-            instance
+            data
           )
         end
       end
     end
 
-    def render_template(template_file, data, instance = nil)
+    def render_template(template_file, data)
       renderer(
         template_file,
         base_path,
-        instance.nil? ? create_instance(data) : instance
-      ).render.chomp!
+        data
+      ).render
     end
 
-    def create_instance(data)
+    def renderer(template_file, base_path, data)
+      Renderer.new(template_file, base_path, create_instance(template_file, data))
+    end
+
+    def create_instance(template_file, data)
       begin
-        create_model(klass, data)
+        create_model(template_file, data)
       rescue Exception => e
         @logger.error("Renderer.model: exeception #{e.message}")
         raise Errors::ViewModelNotFound
       end
     end
 
-    def renderer(template_file, base_path, model_object)
-      Renderer.new(template_file, base_path, model_object)
-    end
-
     private
-    def template_locations
-      Dir.glob("#{base_path}/templates/*")
+    def create_model(template_file, data)
+      require model_location_for template_file
+      klass = Views.get_registered_class("#{@component_id}_#{template_file}")
+
+      @logger.info("Renderer.model: creating new klass #{klass}")
+      klass.new(data)
     end
 
-    def klass
-      require model_location
-      Views.get_registered_class(@model_file)
+    def model_location_for(template_file)
+      File.join(base_path, 'models', "#{template_file}.rb")
     end
 
-    def create_model(klass, data)
-      @logger.info("Renderer.model: creating new klass #{klass}")
-      klass.new(data)
+    def template_locations
+      Dir.glob("#{base_path}/templates/*")
     end
 
     def template_id_for(template_location)
       template_location.split('/').last.sub(/\.mustache/, '')
     end
 
-    def model_location
-      File.join(base_path, 'models', "#{@model_file}.rb")
-    end
-
   end
 end

data/lib/alephant/preview/server.rb

@@ -60,11 +60,11 @@ module Alephant
       end
 
       def base_path
-        "#{Dir.pwd}/components/#{id}"
+        "#{Dir.pwd}/components"
       end
 
       def fixture_location
-        "#{base_path}/fixtures/#{fixture}.json"
+        "#{base_path}/#{id}/fixtures/#{fixture}.json"
       end
 
       def preview_template_location

data/lib/alephant/version.rb

@@ -1,3 +1,3 @@
 module Alephant
-  VERSION = "0.0.9.1"
+  VERSION = "0.0.9.2"
 end

data/spec/alephant_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Alephant::Alephant do
-  let(:model_file) { 'foo' }
   subject { Alephant::Alephant }
 
   describe "initialize(opts = {})" do
@@ -19,7 +18,6 @@ describe Alephant::Alephant do
 
     it "sets specified options" do
       instance = subject.new({
-        :model_file         => :model_file,
         :s3_bucket_id       => :s3_bucket_id,
         :s3_object_path     => :s3_object_path,
         :s3_object_id       => :s3_object_id,
@@ -30,7 +28,6 @@ describe Alephant::Alephant do
         :component_id       => :component_id
       })
 
-      expect(instance.model_file).to eq(:model_file);
       expect(instance.s3_bucket_id).to eq(:s3_bucket_id);
       expect(instance.s3_object_path).to eq(:s3_object_path);
       expect(instance.s3_object_id).to eq(:s3_object_id);
@@ -44,7 +41,6 @@ describe Alephant::Alephant do
     it "sets unspecified options to nil" do
       instance = subject.new
 
-      expect(instance.model_file).to eq(nil);
       expect(instance.s3_bucket_id).to eq(nil);
       expect(instance.s3_object_path).to eq(nil);
       expect(instance.s3_object_id).to eq(nil);
@@ -90,10 +86,11 @@ describe Alephant::Alephant do
 
     context "initializes @multi_renderer" do
       it "MultiRenderer class to be initialized" do
-        Alephant::MultiRenderer.should_receive(:new).with(model_file, 'components/foo')
+        Alephant::MultiRenderer
+          .should_receive(:new)
+          .with('foo', 'components')
 
         instance = subject.new({
-          :model_file   => model_file,
           :view_path    => 'components',
           :component_id => 'foo'
         })

data/spec/fixtures/components/foo/models/foo.rb

@@ -1,5 +1,5 @@
 module MyApp
-  class Foo < ::Alephant::Views::Base
+  class FooFoo < ::Alephant::Views::Base
     def content
       "content"
     end

data/spec/multi_renderer_spec.rb

@@ -1,95 +1,103 @@
+
 require 'spec_helper'
 
 describe Alephant::MultiRenderer do
-  let(:model_file) { 'foo' }
+  let(:component_id) { :foo }
   subject { Alephant::MultiRenderer }
 
-  before(:each) do
-      @instance = subject.new(model_file)
-      @instance.base_path = File.join(
-        File.dirname(__FILE__),
-        'fixtures',
-        'components',
-        'foo'
-      )
-  end
-
-  describe ".initialize(view_base_path)" do
-    context "view_base_path = nil" do
-      it "sets base_path" do
-        expect(subject.new(model_file).base_path).to eq(Alephant::MultiRenderer::DEFAULT_LOCATION)
+  describe "initialize(view_base_path)" do
+    context "view_base_path = invalid_path" do
+      it "should raise InvalidViewPath" do
+        expect {
+          instance = subject.new(component_id, './invalid_path')
+        }.to raise_error(
+          Alephant::Errors::InvalidViewPath
+        )
       end
     end
 
     context "view_base_path = '.'" do
       it "sets base_path" do
-        expect(subject.new(model_file, '.').base_path).to eq('.')
+        File.stub(:directory?).and_return(true)
+        expect(subject.new(component_id, '.').base_path).to eq("./#{component_id}")
       end
     end
 
-    context "view_base_path = invalid_path" do
-      it "should raise InvalidViewPath" do
-        expect {
-          instance = subject.new(model_file, './invalid_path')
-        }.to raise_error(
-          Alephant::Errors::InvalidViewPath
-        )
+    context "view_base_path = nil" do
+      it "sets base_path" do
+        expect(subject.new(component_id).base_path).to eq(Alephant::MultiRenderer::DEFAULT_LOCATION)
       end
     end
   end
 
-  describe "#render_template(template_file, data, instance = nil)" do
+  describe "render_template(template_file, data, instance = nil)" do
+    before(:each) do
+      File.stub(:directory?).and_return(true)
+    end
+
     context "instance is not nil" do
-      let(:data) { { :foo => :bar } }
-      let(:model_instance) { @instance.create_instance(data) }
+      let(:data) {{ :foo => :bar }}
+
       it "renders the specified template" do
+        Alephant::MultiRenderer.any_instance.stub(:create_instance)
+        Alephant::Renderer.any_instance.stub(:render).and_return('content')
+
         expect(
-          @instance.render_template('foo', data, model_instance)
+          subject.new(component_id, '.')
+            .render_template('foo', data)
         ).to eq('content')
       end
     end
+  end
 
-    context "instance is nil" do
-      let(:data) { { :foo => :bar } }
-      it "renders the specified template" do
-        expect(
-          @instance.render_template('foo', data, nil)
-        ).to eq('content')
-      end
+  describe "render(data)" do
+    before(:each) do
+      File.stub(:directory?).and_return(true)
     end
 
+    it "calls ::Alephant::renderer.render() for each template found" do
+      Alephant::MultiRenderer.any_instance.stub(:create_instance)
+      Alephant::Renderer.any_instance.stub(:render).and_return('content')
 
-  end
+      Dir.stub(:glob).and_return(['/some/path/foo.mustache', '/some/path/bar.mustache'])
 
-  describe "#render(data)" do
-    it "calls ::Alephant::renderer.render() for each template found" do
       templates = {
         :foo => 'content',
         :bar => 'content'
       }
 
-      content = @instance.render({ :foo => :bar })
+      instance = subject.new(component_id, '.')
+
+      content = instance.render({ :foo => :bar })
+
+      expect(content.size).to eq(2)
+
       content.each do |template_type, rendered_content|
         expect(rendered_content).to eq(templates[template_type])
       end
     end
   end
 
-  describe "#create_instance(data)" do
+  describe "create_instance(template_file, data)" do
+    before(:each) do
+      File.stub(:directory?).and_return(true)
+    end
+
     let(:data) {{ :key => :value }}
 
     it "returns the model" do
-      model = @instance.create_instance(data)
+      instance = subject.new(component_id, 'fixtures/components')
+      model = instance.create_instance('foo', data)
       model.should be_an Alephant::Views::Base
       expect(model.data).to eq(data)
     end
 
     context "invalid model" do
       it 'should raise ViewModelNotFound' do
-        instance = subject.new('invalid_model_file', @base_path)
+        instance = subject.new(component_id, @base_path)
 
         expect {
-          instance.create_instance(data)
+          instance.create_instance('invalid_model', data)
         }.to raise_error(
           Alephant::Errors::ViewModelNotFound
         )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant
 version: !ruby/object:Gem::Version
-  version: 0.0.9.1
+  version: 0.0.9.2
 platform: java
 authors:
 - Robert Kenny
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec