breezy 0.1.3 → 0.1.4

data/lib/breezy/version.rb

@@ -1,3 +1,3 @@
 module Breezy
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/breezy_template/search_extension.rb

@@ -7,13 +7,6 @@ module BreezyTemplate
       found
     end
 
-    def array!(collection = [], *attributes)
-      original_search_path = @search_path
-      super
-    ensure
-      @search_path = original_search_path
-    end
-
     def _filter_by_path(search_path)
       if search_path.is_a? ::String
         return _filter_by_path(search_path.split('.'))
@@ -21,11 +14,26 @@ module BreezyTemplate
       @search_path = search_path
     end
 
+    def _mapping_element(element, options)
+      if @search_path && !@search_path.empty?
+        original_search_path = @search_path
+        @search_path = original_search_path[1..-1]
+        if @search_path.size == 0
+          @found = super
+        else
+          yield element
+        end
+
+        @search_path = original_search_path
+      else
+        super
+      end
+    end
+
     def _prepare_collection_for_map(collection)
       if @search_path && !@search_path.empty?
         id_name, id_val = @search_path.first.split('=')
 
-        @search_path = @search_path[1..-1]
 
         if (defined? ::ActiveRecord) && collection.is_a?(::ActiveRecord::Relation)
           if id_val
@@ -46,7 +54,11 @@ module BreezyTemplate
             found = collection[index]
           end
 
-          collection = [found]
+          if found
+            collection = [found]
+          else
+            collection = []
+          end
         end
       else
         super
@@ -54,21 +66,34 @@ module BreezyTemplate
     end
 
     def set!(key, value = BLANK, *args)
+      return if @found
       options = args.first || {}
       options = _normalize_options(options)
 
-      if ::Kernel.block_given? && @search_path && !@search_path.empty?
+      if @search_path && !@search_path.empty?
         if key.to_s == @search_path.first
           original_search_path = @search_path
           @search_path = original_search_path[1..-1]
           if @search_path.size == 0
-            @found = if _cache_options?(options)
-              _cache(*options[:cache]) { _scope { yield self } }
+            if ::Kernel.block_given?
+              @found = if _cache_options?(options)
+                _cache(*options[:cache]) { _scope { yield self } }
+              else
+                _scope { yield self }
+              end
+            elsif _partial_options?(options)
+              super
             else
-              _scope { yield self }
+              @found = value
             end
           else
-            yield self
+            if ::Kernel.block_given?
+              yield self
+            elsif _partial_options?(options)
+              super
+            else
+              ::Kernel.raise 'can not'
+            end
           end
 
           @search_path = original_search_path

data/lib/generators/breezy/install/install_generator.rb

@@ -0,0 +1,61 @@
+module Breezy
+  module Generators
+    class InstallGenerator < ::Rails::Generators::Base
+       desc <<-DESC
+Description:
+    Copy breezy files to your application.
+DESC
+      def self.source_root
+        @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      end
+
+      def create_views_and_layouts
+        empty_directory 'app/assets/javascripts/views'
+        empty_directory 'app/assets/javascripts/layouts'
+        empty_directory 'app/assets/javascripts/components'
+      end
+
+      def copy_view_component
+        copy_file 'View.js.jsx', 'app/assets/javascripts/components/View.js.jsx'
+        copy_file 'boot.js', 'app/assets/javascripts/boot.js'
+        copy_file 'Default.js.jsx', 'app/assets/javascripts/layouts/default.js.jsx'
+      end
+
+      def append_js_requires
+        app_js = "app/assets/javascripts/application.js"
+
+        if File.readlines("#{Rails.root}/#{app_js}").grep(/require_tree/).any?
+          inject_into_file app_js, before: '//= require_tree .' do
+            "//= require breezy\n//= require boot\n//= require_tree ./layouts\n//= require_tree ./views\n//= require_tree ./components\n"
+          end
+        end
+      end
+
+      def append_entry_point
+        app_html = 'app/views/layouts/application.html.erb'
+        js_tag = <<-JS_TAG
+  <script type="text/javascript">
+    document.addEventListener('breezy:load', function(event){
+      var props = {
+        view: event.data.view,
+        data:  event.data.data
+      }
+      ReactDOM.render(React.createElement(window.App.Components.View, props), document.getElementById('app'));
+    });
+
+    $(function(){ <%= breezy_snippet %> });
+
+  </script>
+        JS_TAG
+
+        inject_into_file app_html, before: '</head>' do
+          js_tag
+        end
+
+        inject_into_file app_html, after: '</head>' do
+          "\n<div id='app'></div>"
+        end
+      end
+    end
+  end
+end

data/lib/generators/breezy/install/templates/Default.js.jsx

@@ -0,0 +1,7 @@
+App.Layouts.Default = function(view) {
+   return (
+      <div className='container'>
+        {view}
+      </div>
+   );
+}

data/lib/generators/breezy/install/templates/View.js.jsx

@@ -0,0 +1,7 @@
+App.Components.View = React.createClass({
+  render: function() {
+    var view = App.Views[this.props.view].call(this, this.props.data);
+    var layout = App.Layouts[this.props.layout || 'Default'];
+    return layout(view);
+  }
+});

data/lib/generators/breezy/install/templates/boot.js

@@ -0,0 +1,5 @@
+window.App = {
+  Views: {},
+  Layouts: {},
+  Components:{}
+}

data/lib/generators/breezy/view/templates/view.js.breezy

@@ -0,0 +1,15 @@
+# Example:
+#
+# json.notice notice
+#
+# json.posts do
+#   json.array! @posts do |post|
+#     json.id post.id
+#     json.title post.title
+#     json.body post.body
+#
+#     json.show_url post_path(post)
+#     json.edit_url edit_post_path(post)
+#     json.delete_url post_path(post)
+#   end
+# end

data/lib/generators/breezy/view/templates/view.js.jsx

@@ -0,0 +1,8 @@
+App.Views.<%= @js_filename %> = function(json) {
+
+  return (
+    <div>
+    </div>
+  );
+};
+

data/lib/generators/breezy/view/view_generator.rb

@@ -0,0 +1,35 @@
+module Breezy
+  module Generators
+    class ViewGenerator < ::Rails::Generators::NamedBase
+       desc <<-DESC
+Description:
+    Creates a content view and jsx view.
+DESC
+      argument :actions, type: :array, default: [], banner: "action action"
+
+      def self.source_root
+        @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      end
+
+      def copy_view_files
+        base_parts = class_path + [file_name]
+        content_destination =  File.join("app/views", base_parts)
+        view_destination = "app/assets/javascripts/views"
+
+        empty_directory content_destination
+        empty_directory view_destination
+
+        actions.each do |action|
+          @action = action
+          @js_filename = (base_parts + [action]).map(&:camelcase).join
+          @content_path =  File.join(content_destination, "#{@action}.js.breezy")
+          @view_path = File.join(view_destination, "#{@js_filename}.js.jsx")
+
+          template 'View.js.jsx', @view_path
+          template 'view.js.breezy', @content_path
+        end
+      end
+
+    end
+  end
+end

data/test/breezy_template_test.rb

@@ -3,6 +3,7 @@ require "mocha/setup"
 require "action_view"
 require "action_view/testing/resolvers"
 require "breezy_template"
+require 'byebug'
 
 BLOG_POST_PARTIAL = <<-JBUILDER
   json.extract! blog_post, :id, :body
@@ -750,6 +751,49 @@ class BreezyTemplateTest < ActionView::TestCase
     assert_equal expected, result
   end
 
+  test "filtering for a raw value is also possble" do
+    result = jbuild(<<-JBUILDER, breezy_filter: 'hit.hit2')
+      json.hit do
+        json.hit2 23
+      end
+
+      json.miss do
+        json.miss2 do
+          raise 'this should not be called'
+          json.greeting 'missed call'
+        end
+      end
+    JBUILDER
+    Rails.cache.clear
+
+    expected = strip_format(<<-JS)
+      (function(){
+        return (
+          {"data":23,"action":"graft","path":"hit.hit2"}
+        );
+      })()
+    JS
+
+    assert_equal expected, result
+  end
+
+  test "filter with partial" do
+    result = jbuild(<<-JBUILDER, breezy_filter: 'hit.hit2.terms')
+      json.hit do
+        json.hit2 partial: "footer"
+      end
+    JBUILDER
+
+    expected = strip_format(<<-JS)
+      (function(){
+        return (
+          {"data":"You agree","action":"graft","path":"hit.hit2.terms"}
+        );
+      })()
+    JS
+    assert_equal expected, result
+  end
+
   test "filtering for a node in the tree via breezy_filter helper" do
     result = jbuild(<<-JBUILDER, breezy_filter: 'hit.hit2')
       json.hit do
@@ -824,7 +868,7 @@ class BreezyTemplateTest < ActionView::TestCase
     expected = strip_format(<<-JS)
       (function(){
         return (
-          {"data":[{"title":"first"}],"action":"graft","path":"hit.hit2.id=1"}
+          {"data":{"title":"first"},"action":"graft","path":"hit.hit2.id=1"}
         );
       })()
     JS
@@ -856,7 +900,7 @@ class BreezyTemplateTest < ActionView::TestCase
     expected = strip_format(<<-JS)
       (function(){
         return (
-          {"data":[{"title":"first"}],"action":"graft","path":"hit.hit2.0"}
+          {"data":{"title":"first"},"action":"graft","path":"hit.hit2.0"}
         );
       })()
     JS
@@ -879,7 +923,7 @@ class BreezyTemplateTest < ActionView::TestCase
     expected = strip_format(<<-JS)
       (function(){
         return (
-          {"data":[{"name":"hit"}],"action":"graft","path":"hit.hit2.id=1"}
+          {"data":{"name":"hit"},"action":"graft","path":"hit.hit2.id=1"}
         );
       })()
     JS
@@ -903,7 +947,7 @@ class BreezyTemplateTest < ActionView::TestCase
     expected = strip_format(<<-JS)
       (function(){
         return (
-          {"data":[{"name":"hit"}],"action":"graft","path":"hit.hit2.0"}
+          {"data":{"name":"hit"},"action":"graft","path":"hit.hit2.0"}
         );
       })()
     JS
@@ -1021,7 +1065,7 @@ class BreezyTemplateTest < ActionView::TestCase
 
     expected = strip_format(<<-JS)
       (function(){
-        return ({"data":{"world":32},"action":"graft","path":"hello.world"});
+        return ({"data":32,"action":"graft","path":"hello.world"});
       })()
     JS
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: breezy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Johny Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -113,7 +113,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- app/views/breezy/response.html.erb
 - lib/assets/javascripts/breezy.coffee
+- lib/assets/javascripts/breezy/component_url.coffee
+- lib/assets/javascripts/breezy/controller.coffee
+- lib/assets/javascripts/breezy/csrf_token.coffee
+- lib/assets/javascripts/breezy/doubly_linked_list.coffee
+- lib/assets/javascripts/breezy/parallel_queue.coffee
+- lib/assets/javascripts/breezy/progress_bar.coffee
+- lib/assets/javascripts/breezy/remote.coffee
+- lib/assets/javascripts/breezy/snapshot.coffee
+- lib/assets/javascripts/breezy/start.coffee
+- lib/assets/javascripts/breezy/utils.coffee
 - lib/breezy.rb
 - lib/breezy/active_support.rb
 - lib/breezy/configuration.rb
@@ -132,6 +143,13 @@ files:
 - lib/breezy_template/handler.rb
 - lib/breezy_template/partial_extension.rb
 - lib/breezy_template/search_extension.rb
+- lib/generators/breezy/install/install_generator.rb
+- lib/generators/breezy/install/templates/Default.js.jsx
+- lib/generators/breezy/install/templates/View.js.jsx
+- lib/generators/breezy/install/templates/boot.js
+- lib/generators/breezy/view/templates/view.js.breezy
+- lib/generators/breezy/view/templates/view.js.jsx
+- lib/generators/breezy/view/view_generator.rb
 - test/blade_helper.rb
 - test/breezy_template_test.rb
 - test/breezy_test.rb