rodf 1.0.0 → 1.1.0

data/lib/rodf/column.rb

@@ -1,19 +1,6 @@
 # Copyright (c) 2008 Thiago Arrais
 #
 # This file is part of rODF.
-#
-# rODF is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-
-# rODF is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public License
-# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'builder'
 
@@ -29,4 +16,3 @@ module RODF
     end
   end
 end
-

data/lib/rodf/compatibility.rb

@@ -1,19 +1,7 @@
 # Copyright (c) 2010-2012 Thiago Arrais
 #
 # This file is part of rODF.
-#
-# rODF is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-
-# rODF is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
 
-# You should have received a copy of the GNU Lesser General Public License
-# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
 require 'builder'
 
 if !String.method_defined? :to_xs

data/lib/rodf/container.rb

@@ -1,54 +1,72 @@
 # Copyright (c) 2008 Thiago Arrais
 #
 # This file is part of rODF.
-#
-# rODF is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-
-# rODF is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public License
-# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'active_support/inflector'
+require 'dry/inflector'
 
 module RODF
   class Container
+    INFLECTOR = Dry::Inflector.new.freeze
+
     def self.contains(*stuffs_array)
       stuffs_array.map {|sym| sym.to_s}.each do |stuffs|
-        stuff = stuffs.to_s.singularize
-        stuff_class = eval(stuff.camelize)
-
-        self.class_eval "
-          def #{stuffs}
-            @#{stuffs} ||= []
-          end"
-
-        self.class_eval "
-          def #{stuff}(*args, &contents)
-            c = #{stuff_class}.new(*args)
-            c.instance_eval(&contents) if block_given?
-            #{stuffs} << c
+        stuff = INFLECTOR.singularize(stuffs.to_s)
+        stuff_class = RODF.const_get(INFLECTOR.camelize(stuff))
+
+        module_for_stuff.instance_exec do
+          define_method stuffs do
+            instance_variable_name = :"@#{stuffs}"
+
+            if instance_variable_defined?(instance_variable_name)
+              return instance_variable_get(instance_variable_name)
+            end
+
+            instance_variable_set(instance_variable_name, [])
+          end
+
+          define_method stuff do |*args, &contents|
+            c = stuff_class.new(*args, &contents)
+            public_send(stuffs) << c
             c
-          end"
+          end
+
+          define_method "add_#{stuffs}" do |*elements|
+            elements = elements.first if elements.first.is_a?(Array)
+            elements.each do |element|
+              public_send(stuff, element)
+            end
+          end
 
-        self.class_eval "
-          def #{stuffs}_xml
-            #{stuffs}.map {|c| c.xml}.join
-          end"
+          define_method "#{stuffs}_xml" do
+            public_send(stuffs).map(&:xml).join
+          end
+        end
       end
     end
 
+    def self.module_for_stuff
+      if const_defined?(:StuffMethods, false)
+        mod = const_get(:StuffMethods)
+      else
+        mod = const_set(:StuffMethods, Module.new)
+        include mod
+      end
+      mod
+    end
+
     def self.create(*args, &contents)
-      container = self.new(*args)
-      container.instance_eval(&contents) if block_given?
+      container = new(*args, &contents)
       container.xml
     end
+
+    def initialize(*_args, &contents)
+      return unless contents
+
+      if contents.arity.zero?
+        instance_exec(self, &contents)
+      else
+        yield(self)
+      end
+    end
   end
 end
-

data/lib/rodf/data_style.rb

@@ -1,24 +1,11 @@
 # Copyright (c) 2010 Thiago Arrais
 #
 # This file is part of rODF.
-#
-# rODF is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-
-# rODF is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public License
-# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'builder'
 
-require 'rodf/container'
-require 'rodf/style_section'
+require_relative 'container'
+require_relative 'style_section'
 
 module RODF
   class DataStyle < Container
@@ -27,6 +14,8 @@ module RODF
     alias section style_section
 
     def initialize(name, type)
+      super
+
       @type, @name = type, name
     end
 

data/lib/rodf/document.rb

@@ -1,32 +1,24 @@
 # Copyright (c) 2010 Thiago Arrais
 #
 # This file is part of rODF.
-#
-# rODF is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-
-# rODF is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public License
-# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'zip'
 
-require 'rodf/container'
-require 'rodf/skeleton'
-require 'rodf/style'
+require_relative 'container'
+require_relative 'skeleton'
+require_relative 'style'
 
 module RODF
   class Document < Container
     contains :styles, :default_styles, :office_styles
 
     def self.file(ods_file_name, &contents)
-      (doc = new).instance_eval(&contents)
+      doc = new
+      if contents.arity.zero?
+        contents.call(doc)
+      else
+        doc.instance_exec(doc, &contents)
+      end
       doc.write_to ods_file_name
     end
 
@@ -62,4 +54,3 @@ module RODF
     end
   end
 end
-

data/lib/rodf/hyperlink.rb

@@ -1,27 +1,16 @@
 # Copyright (c) 2010 Thiago Arrais
 #
 # This file is part of rODF.
-#
-# rODF is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-
-# rODF is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public License
-# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'builder'
 
-require 'rodf/paragraph_container'
+require_relative 'paragraph_container'
 
 module RODF
   class Hyperlink < ParagraphContainer
     def initialize(first, second = {})
+      super
+
       if second.instance_of?(Hash) && second.empty?
         @href = first
       else
@@ -47,4 +36,3 @@ module RODF
     alias a link
   end
 end
-

data/lib/rodf/master_page.rb

@@ -1,19 +1,6 @@
 # Copyright (c) 2010 Thiago Arrais
 #
 # This file is part of rODF.
-#
-# rODF is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-
-# rODF is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public License
-# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'builder'
 
@@ -29,4 +16,3 @@ module RODF
     end
   end
 end
-

data/lib/rodf/page_layout.rb

@@ -1,30 +1,19 @@
 # Copyright (c) 2010 Thiago Arrais
 #
 # This file is part of rODF.
-#
-# rODF is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-
-# rODF is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public License
-# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'builder'
 
-require 'rodf/container'
-require 'rodf/property'
+require_relative 'container'
+require_relative 'property'
 
 module RODF
   class PageLayout < Container
     contains :properties
 
     def initialize(name)
+      super
+
       @name = name
     end
 
@@ -35,4 +24,3 @@ module RODF
     end
   end
 end
-

data/lib/rodf/paragraph.rb

@@ -1,27 +1,16 @@
 # Copyright (c) 2010 Thiago Arrais
 #
 # This file is part of rODF.
-#
-# rODF is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-
-# rODF is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public License
-# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'builder'
 
-require 'rodf/paragraph_container'
+require_relative 'paragraph_container'
 
 module RODF
   class Paragraph < ParagraphContainer
     def initialize(fst = nil, snd = {})
+      super
+
       first_is_hash = fst.instance_of? Hash
       span(fst) unless first_is_hash
       @elem_attrs = make_element_attributes(first_is_hash ? fst : snd)

data/lib/rodf/paragraph_container.rb

@@ -1,23 +1,10 @@
 # Copyright (c) 2010 Thiago Arrais
 #
 # This file is part of rODF.
-#
-# rODF is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-
-# rODF is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public License
-# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'builder'
 
-require 'rodf/container'
+require_relative 'container'
 
 module RODF
   # Container for all kinds of paragraph content
@@ -31,4 +18,3 @@ module RODF
     end
   end
 end
-

data/lib/rodf/property.rb

@@ -1,19 +1,6 @@
 # Copyright (c) 2008 Thiago Arrais
 #
 # This file is part of rODF.
-#
-# rODF is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-
-# rODF is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public License
-# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'builder'
 
@@ -127,4 +114,3 @@ module RODF
     end
   end
 end
-

data/lib/rodf/row.rb

@@ -1,24 +1,11 @@
 # Copyright (c) 2008 Thiago Arrais
 #
 # This file is part of rODF.
-#
-# rODF is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-
-# rODF is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public License
-# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'builder'
 
-require 'rodf/container'
-require 'rodf/cell'
+require_relative 'container'
+require_relative 'cell'
 
 module RODF
   class Row < Container
@@ -29,6 +16,8 @@ module RODF
     def initialize(number=0, opts={})
       @number = number
       @style = opts[:style]
+
+      super
     end
 
     def xml
@@ -40,4 +29,3 @@ module RODF
     end
   end
 end
-