thinreports 0.7.7 → 0.8.0

data/lib/thinreports/core/events.rb

@@ -1,27 +1,28 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core
-    
+
     class Events
+      include Utils
+
       Event = ::Struct.new(:type, :target)
-      
-      # @return [Hash<Symbol, ThinReports::Core::Events::Event>]
-      # @private
+
+      # @return [Hash<Symbol, Thinreports::Core::Events::Event>]
       attr_accessor :events
-      
+
       # @param [Symbol] types
       def initialize(*types)
         @events = {}
         @types  = types
       end
-      
+
       # @param [Symbol] type
       # @yield [e]
-      # @yieldparam [ThinReports::Core::Events::Event] e
+      # @yieldparam [Thinreports::Core::Events::Event] e
       def listen(type, &block)
         verify_event_type(type)
-        
+
         if block_given?
           events[type] = block
         else
@@ -29,14 +30,13 @@ module ThinReports
         end
       end
       alias_method :on, :listen
-      
+
       # @param [Symbol] type
       def unlisten(type)
         events.delete(type)
       end
       alias_method :un, :unlisten
-      
-      # @private
+
       def dispatch(e)
         unless e.type
           raise ArgumentError, 'Event#type attribute is required'
@@ -47,22 +47,21 @@ module ThinReports
           event.call(e)
         end
       end
-      
-      # @private
+
       def copy
         new_events = self.dup
-        new_events.events = events.simple_deep_copy
+        new_events.events = deep_copy(events)
         new_events
       end
-      
+
     private
-      
+
       # @param [Symbol] type
       def verify_event_type(type)
         return if @types.empty?
-        
+
         unless @types.include?(type)
-          raise ThinReports::Errors::UnknownEventType
+          raise Thinreports::Errors::UnknownEventType
         end
       end
     end

data/lib/thinreports/core/format/base.rb

@@ -1,52 +1,52 @@
 # coding: utf-8
+require 'thinreports/core/format/builder'
+
+module Thinreports::Core
+  module Format
 
-module ThinReports
-  module Core::Format
-    
     # @abstract
-    # @private
     class Base
+      extend Format::Builder
+
       class << self
-        include Core::Format::Builder
-        
         def config_reader(*configs, &block)
           each_configs(*configs) do |m, location|
             define_read_method(m, location, &block)
           end
         end
-        
+
         def config_checker(check, *configs)
           checker = lambda {|val| val == check}
           each_configs(*configs) do |m, location|
             define_read_method(:"#{m}?", location, &checker)
           end
         end
-        
+
         def config_writer(*configs)
           each_configs(*configs) do |m, location|
             define_write_method(m, location)
           end
         end
-        
+
         def config_accessor(*configs, &block)
           config_reader(*configs, &block)
           config_writer(*configs)
         end
-        
+
         private
-        
+
         def define_read_method(m, location = nil, &block)
           define_method(m) do
             read(*location, &block)
           end
         end
-        
+
         def define_write_method(m, location = nil)
           define_method(:"#{m}=") do |value|
             write(value, *location)
           end
         end
-        
+
         def each_configs(*configs, &block)
           c = configs.first.is_a?(::Hash) ? configs.first : (configs || [])
           c.each do |m, location|
@@ -54,14 +54,14 @@ module ThinReports
           end
         end
       end
-      
+
       def initialize(config, &block)
         @config = config
         block.call(self) if ::Kernel.block_given?
       end
-      
+
       private
-      
+
       def find(*keys)
         if keys.empty?
           @config
@@ -71,18 +71,18 @@ module ThinReports
           end
         end
       end
-      
+
       def write(value, *keys)
         key = keys.pop
         owner = find(*keys)
         owner[key] = value
       end
-      
+
       def read(*keys, &block)
         value = find(*keys)
         ::Kernel.block_given? ? block.call(value) : value
       end
     end
-    
+
   end
-end
+end

data/lib/thinreports/core/format/builder.rb

@@ -1,33 +1,25 @@
 # coding: utf-8
 
-begin
-  require 'json'
-rescue LoadError
-  puts 'ThinReports requires json >= 1.4.6. ' +
-       'Please `gem install json` and try again.'
-end
+require 'json'
+
+module Thinreports::Core
+  module Format
 
-module ThinReports
-  module Core::Format
-    
-    # @private
     module Builder
       def build(*args)
         build_internal(*args)
-      rescue ThinReports::Errors::Basic => e
+      rescue Thinreports::Errors::Basic => e
         raise
       rescue => e
-        raise ThinReports::Errors::InvalidLayoutFormat
+        raise Thinreports::Errors::InvalidLayoutFormat
       end
-      
-    private
-      
+
       # @abstract
       def build_internal(*args)
         raise NotImplementedError
       end
 
-      # @param [ThinReports::Core::Format::Base] format
+      # @param [Thinreports::Core::Format::Base] format
       # @param [Hash] options
       def build_layout(format, options = {}, &block)
         level = '-' * ((options[:level] || 1 ) - 1)
@@ -39,23 +31,23 @@ module ThinReports
         end
         format.layout.gsub!(pattern, '')
       end
-      
+
       # @param [String] svg
       def clean(svg)
         svg.gsub!(/<!--.*?-->/, '')
       end
-      
+
       # @param [String] svg
       def clean_with_attributes(svg)
         clean(svg)
         svg.gsub!(/ x\-[a-z\d\-]+?=".*?"/, '')
-        svg.gsub!(/ class=".*?"/, '')        
+        svg.gsub!(/ class=".*?"/, '')
       end
-      
+
       def shape_tag(format)
         %{<%= r(:"#{format.id}")%>}
       end
-      
+
       def parsed_format_and_shape_type(json_string)
         f = parse_json(json_string)
         [ f['type'], f ]
@@ -65,6 +57,6 @@ module ThinReports
         JSON.parse(json_string)
       end
     end
-    
+
   end
 end

data/lib/thinreports/core/shape.rb

@@ -1,31 +1,27 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core
-    
+
     module Shape
-      # @private
       def Interface(parent, format)
         find_by_type(format.type)::Interface.new(parent, format)
       end
-      
-      # @private
+
       def Format(type)
         find_by_type(type)::Format
       end
-      
-      # @private
+
       def Configuration(type)
         klass = find_by_type(type)
         unless klass.const_defined?(:Configuration)
-          raise ThinReports::Errors::NoConfigurationFound, type
+          raise Thinreports::Errors::NoConfigurationFound, type
         end
         klass.const_get(:Configuration)
       end
-      
+
       module_function :Interface, :Format, :Configuration
-      
-      # @private
+
       def self.find_by_type(type)
         case type
         when TextBlock::TYPE_NAME  then TextBlock
@@ -35,11 +31,11 @@ module ThinReports
         when PageNumber::TYPE_NAME then PageNumber
         when *Basic::TYPE_NAMES    then Basic
         else
-          raise ThinReports::Errors::UnknownShapeType
+          raise Thinreports::Errors::UnknownShapeType
         end
       end
     end
-  
+
   end
 end
 

data/lib/thinreports/core/shape/base.rb

@@ -2,15 +2,14 @@
 
 require 'forwardable'
 
-module ThinReports
+module Thinreports
   module Core::Shape
-    
-    # @private
+
     module Base
     end
-    
+
   end
 end
 
 require 'thinreports/core/shape/base/internal'
-require 'thinreports/core/shape/base/interface'
+require 'thinreports/core/shape/base/interface'

data/lib/thinreports/core/shape/base/interface.rb

@@ -1,38 +1,38 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
-    
-    # @private
+
     # @abstract
     class Base::Interface
-      extend ::Forwardable
-      
+      include Utils
+      extend  Forwardable
+
       def self.internal_delegators(*args)
         def_delegators :internal, *args
       end
       private_class_method :internal_delegators
-      
+
       attr_reader :internal
-      
+
       def initialize(parent, format, internal = nil)
         @internal = internal || init_internal(parent, format)
       end
-      
+
       def copy(parent)
         self.class.new(parent, internal.format, internal.copy(parent))
       end
-      
+
     private
-    
-      # @param [ThinReports::Core::Page, ThinReports::Core::Shape::List::SectionInterface] parent
-      # @param [ThinReports::Core::Shape::Basic::Format] format
-      # @return [ThinReports::Core::Shape::Basic::Internal]
+
+      # @param [Thinreports::Report::Page, Thinreports::Core::Shape::List::SectionInterface] parent
+      # @param [Thinreports::Core::Shape::Basic::Format] format
+      # @return [Thinreports::Core::Shape::Basic::Internal]
       # @abstract
       def init_internal(parent, format)
         raise NotImplementedError
       end
     end
-    
+
   end
-end
+end

data/lib/thinreports/core/shape/base/internal.rb

@@ -1,54 +1,49 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Core::Shape
-    
-    # @private
+
     # @abstract
     class Base::Internal
-      extend ::Forwardable
-      
+      include Utils
+      extend  Forwardable
+
       def self.format_delegators(*args)
         def_delegators :format, *args
       end
       private_class_method :format_delegators
-      
+
       attr_reader :parent
       attr_reader :format
       attr_writer :style
       attr_accessor :states
-      
+
       def initialize(parent, format)
         @parent = parent
         @format = format
         @states = {}
         @style  = nil
-        
+
         @finalized_attributes = nil
       end
-      
+
       def style
         raise NotImplementedError
       end
-      
+
       def copy(new_parent, &block)
         new_internal = self.class.new(new_parent, format)
         new_internal.style  = style.copy
-        new_internal.states = states.simple_deep_copy
-        
+        new_internal.states = deep_copy(states)
+
         block.call(new_internal) if block_given?
         new_internal
       end
-      
-      def switch_parent!(new_parent)
-        @parent = new_parent
-        self
-      end
-      
+
       def type_of?(type_name)
         raise NotImplementedError
       end
     end
-    
+
   end
-end
+end