qor_layout 0.0.1 → 0.0.2

data/Gemfile

@@ -1,9 +1,3 @@
 source :rubygems
 
-# gem_rails
-#
-# gem "qor_extlib", :path => '..'
-# gem 'qor_resources_engine', :path => '..'
-# gem 'qor_form', :path => '..'
-#
-# gem 'default_value_for'
+gemspec

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/app/models/qor/layout/setting.rb

@@ -30,12 +30,12 @@ module Qor
 
       def values(name, for_setting=false)
         stored_value   = (value || {}).with_indifferent_access[name]
-        gadget_setting = gadget_settings[name]
+        gadget_setting = gadget_settings.find(:meta, name)
 
         if stored_value =~ /^([\w:]+)\((\d+)\)$/
           return ($1.constantize.find_by_id($2) rescue stored_value)
-        elsif gadget_setting && (gadget_setting[:type].to_s == 'gadget')
-          gadget_name = gadget_setting[:name] || name
+        elsif gadget_setting && (gadget_setting.options[:type].to_s == 'gadget')
+          gadget_name = gadget_setting.options[:name] || name
           gadgets = children.where(:name => gadget_name)
           return (for_setting ? gadgets.map(&:settings) : gadgets)
         else
@@ -44,10 +44,9 @@ module Qor
       end
 
       def meta_settings
-        gadget_settings.inject({}) do |s, setting|
-          key   = setting[0]
-          value = values(key, true)
-          s.merge({key => value})
+        gadget_settings.children.inject({}) do |s, setting|
+          value = values(setting.name, true)
+          s.merge({setting.name => value})
         end.with_indifferent_access
       end
 
@@ -58,8 +57,10 @@ module Qor
       def value_attributes=(attrs)
         attrs       = attrs.with_indifferent_access
         value_attrs = {}
-        gadget_settings.map do |key, value|
-          if value[:type].to_s =~ /image|file|media/
+        gadget_settings.find(:meta).map do |child|
+          key = child.name
+
+          if child.options[:type].to_s =~ /image|file|media/
             if self.value && (self.value[key] =~ /^([\w:]+)\((\d+)\)$/)
               asset = $1.constantize.find_by_id($2).update_attribute(:data, attrs[key]) if attrs[key]
               value_attrs.update({key => self.value[key]})
@@ -96,8 +97,8 @@ module Qor
       end
 
       def settings
-        if gadget.try(:context_blk)
-          self.instance_eval &gadget.try(:context_blk)
+        if gadget.first(:context).try(:block)
+          self.instance_eval &gadget.first(:context).try(:block)
         else
           meta_settings
         end
@@ -105,15 +106,15 @@ module Qor
 
       def resource_attributes_for_settings
         attrs = []
-        (gadget.try(:settings) || {}).map do |key, value|
-          attr_show = !value[:hidden]
-          attrs << Qor::ResourceAttribute.new("value_attributes[#{key}]", gadget_settings[key]) if attr_show
+        gadget_settings.children.map do |child|
+          attr_show = !child.options[:hidden]
+          attrs << Qor::ResourceAttribute.new("value_attributes[#{child.name}]", child.options) if attr_show
         end
         attrs
       end
 
       def render_without_style
-        ::Mustache.render(gadget.try(:template).to_s, settings)
+        ::Mustache.render(gadget.first(:template).try(:value).to_s, settings)
       end
 
 			def render(edit_mode=false)
@@ -124,7 +125,7 @@ module Qor
         style_css     = new_style.map {|k,v| "#{k}: #{v}"}.join("; ")
 
         parse_content.xpath('*').first.set_attribute("qor_layout_elements", id.to_s)
-        parse_content.xpath('*').first.set_attribute("qor_layout_draggable_elements", id.to_s) if gadget.respond_to?(:floating) && gadget.floating
+        parse_content.xpath('*').first.set_attribute("qor_layout_draggable_elements", id.to_s) if gadget.options[:floating]
         parse_content.xpath('*').first.set_attribute("style", style_css)
         extra = edit_mode ? "<div for_qor_layout_elements='#{id}'><a href='/admin/layout_settings/#{id}/edit'><img src='/qor_widget/images/settings.png'/></a></div>" : ""
 
@@ -132,15 +133,11 @@ module Qor
 			end
 
       def gadget
-        Qor::Layout::Configuration.gadgets.with_indifferent_access[name]
+        Qor::Layout::Configuration.find(:gadget, name)
       end
 
       def gadget_settings
-        (gadget.try(:settings) || {}).with_indifferent_access
-      end
-
-      def gadget_children_settings
-        gadget_settings.select {|k,v| v[:type].to_s == 'gadget'}
+        gadget.first(:settings)
       end
 
       def method_missing(method_sym, *args, &block)

data/lib/qor/layout/action.rb

@@ -2,8 +2,8 @@ module Qor
   module Layout
     module Action
       def self.detect_action(app)
-        Qor::Layout::Configuration.actions.values.map do |action|
-          return action if action.detect_blk.safe_call(app)
+        Qor::Layout::Configuration.find(:action).map do |action|
+          return action if action.first(:detect).block.safe_call(app)
         end
       end
     end

data/lib/qor/layout/configuration.rb

@@ -1,144 +1,31 @@
+require 'qor_dsl'
+
 module Qor
   module Layout
     module Configuration
-      class Inputs
-        include Qor::Extlib::Dsl::Configuration::InputMeta
-      end
-
-      class RawData
-        include Qor::Extlib::Dsl::Configuration::RawData
-        attr_accessor :description, :description_blk, :meta_inputs, :template_blk, :context_blk, :detect_blk
-
-        def layout(name, options = {}, &blk)
-          Qor::Layout::Configuration::Layout.new(blk, self.owner, options.merge(:name => name))
-        end
-
-        def gadget(name, options = {}, &blk)
-          Qor::Layout::Configuration::Gadget.new(blk, self.owner, options.merge(:name => name))
-        end
-
-        def action(name, options = {}, &blk)
-          ::Qor::Layout::Configuration::Action.new(blk, self.owner, options.merge(:name => name))
-        end
-
-        def gadgets(name, options = {}, &blk)
-          # TODO define gadgets for layout
-        end
-
-        def settings(&blk)
-          self.meta_inputs = Inputs.new
-          self.meta_inputs.instance_eval(&blk)
-          self.meta_inputs
-        end
-
-        def context(&blk)
-          self.context_blk = blk
-        end
-
-        def template(&blk)
-          self.template_blk = blk
-        end
-
-        def detect(&blk)
-          self.detect_blk = blk
-        end
-
-        def desc(description = nil, &blk)
-          raise 'desc must be string or blcok' unless description.is_a?(String) || blk
-          self.description = description
-          self.description_blk = blk
-        end
-      end
-
-      class Base
-        include Qor::Extlib::Dsl::Configuration::Base
-        attr_accessor :name, :floating
-
-        self.raw_data_klazz = ::Qor::Layout::Configuration::RawData
-        def initialize(*arguments)
-          super
-
-          root = arguments[1]
+      include Qor::Dsl
+      default_configs ["config/qor/layout.rb", "config/layout.rb"]
 
-          if root
-            root.group_children ||= {}
-            root.group_children[self.class.to_s] ||= {}
-            root.group_children[self.class.to_s][self.name.to_s] = self
-          end
-        end
+      node :template
 
-        def child_key
-          File.join(self.class.to_s, self.name.to_s)
-        end
+      node :gadget do
+        node :desc
 
-        def description
-          self.raw_data.description || self.raw_data.description_blk.try(:call)
+        node :settings do
+          node :meta
         end
-      end
-
-      class Root < Base
-        attr_accessor :group_children
 
-        def layouts(name=nil)
-          children = group_children[Layout.to_s]
-          children = children[name] if name.present?
-          children
-        end
-
-        def gadgets(name=nil)
-          children = group_children[Gadget.to_s]
-          children = children[name] if name.present?
-          children
-        end
-
-        def gadget_by_name(name)
-          Qor::Layout::Configuration.gadgets.with_indifferent_access[name]
-        end
-
-        def gadget_settings_by_name(name)
-          (gadget_by_name(name).try(:settings) || {}).with_indifferent_access
-        end
-
-        def actions(name=nil)
-          children = group_children[Action.to_s]
-          children = children[name] if name.present?
-          children
-        end
+        node :context
+        node :template, :inherit => true
       end
 
-      class Layout < Base
+      node :layout do
+        node :gadgets
       end
-      class Gadget < Base
-        def settings
-          self.raw_data.meta_inputs.meta_hash.inject({}) do |s, v|
-            s.update({v[0] => {:label => (v[1].with_indifferent_access[:name] || v[0]).to_s}.merge(v[1])})
-          end
-        end
-
-        def context_blk
-          self.raw_data.context_blk
-        end
-
-        def template
-          self.raw_data.template_blk.call
-        end
-      end
-      class Action < Base
-        def detect_blk
-          self.raw_data.detect_blk
-        end
-      end
-
-      class << self
-        def load(path="config/layout.rb")
-          @root = Qor::Extlib::Dsl::Configuration.load(::Qor::Layout::Configuration::Root, path)
-        end
-
-        def root
-          @root ||= load
-        end
 
-        delegate :layouts, :gadgets, :actions, :gadget_by_name, :gadget_settings_by_name, :to => :root
+      node :action do
+        node :desc
+        node :detect
       end
     end
   end

data/qor_layout.gemspec

@@ -16,4 +16,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.add_dependency "qor_dsl"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qor_layout
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
-dependencies: []
+date: 2012-09-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: qor_dsl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easily to make your own layout
 email:
 - wosmvp@gmail.com