xls_sestavy 0.3.3 → 0.3.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjRiNmIxZTI1YTk0Y2U0MDgyOTg4YjdjZGNmMzhjZGMxNjczZjA2ZQ==
-  data.tar.gz: !binary |-
-    MjNjMmRhZDU2ODUwYzljYTE2NjBjYjU1YzU5NDZkMGMzZTY2ZDcxMw==
+SHA1:
+  metadata.gz: ba3b89bcf9f204ad5988d7c112a1b7c7719a1328
+  data.tar.gz: 8348e963d4878e7b0b669d3c1979e3a6d4352614
 SHA512:
-  metadata.gz: !binary |-
-    YjdlMjY5ODkyOTQwMjk0ZjllOGYxZTBkYWJmY2U3MmFmODdlMTk5ODc2MDc4
-    YWY0NjAyOGVmZjRiMGQ0NGFhNTdkMjVhMGJhZWZkYjkzNmIwY2MzYzAwYWQ0
-    NWNjYjdmNzdiN2RiYjE5MTYxZDBmNDcyZjBlODIwMGY1NWFiYjg=
-  data.tar.gz: !binary |-
-    MjA5ZGZjMTlhOTdiYzcwOGVkNWFhZWI2MGM1ZmI3OWY0NjUzZDllMWEwNDcx
-    NmVmYjcwZDQzNTg5Y2VlNzU4OWRlMDIxMWRkZjNjYmU2ZjU4ZGYwZmE1MGIy
-    MTU1NGZiZmE4ZGQwNDJmMWY1MTFlNWYwNGI3NGYxZTk2MmQ5ZDQ=
+  metadata.gz: 27e775ba9121e62b86f2da0bb1019a6cdee112601abc8cce12096c3226a21e3e40be5989dcb503ed8018bcd8b18a4dc54f3398b94244612f0a811d6a12288a0b
+  data.tar.gz: 9d688b94f20d7873adaa9b773ddacc27445bcacceb7ba73b68e5ff0bfac2e2b5dbf2ccb16406b5bff0978f9995a88ea2ae22933cf13ebf1c081e2b807bc05bb8

data/lib/xls_sestavy/sestava.rb

@@ -3,6 +3,7 @@ require "xls_sestavy/tabulky/tabulka"
 require "xls_sestavy/tabulky/sloupce/sloupec"
 require "xls_sestavy/tabulky/sloupce/preddefinovany_sloupce"
 require "xls_sestavy/tabulky/sloupce/definice_sloupcu"
+require "xls_sestavy/tabulky/promenne_radku"
 
 module XLSSestavy
   class Sestava

data/lib/xls_sestavy/tabulky/promenne_radku.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+module XLSSestavy
+  class PromenneRadku
+    attr_reader :tabulka, :objekt
+
+    def initialize
+      @metody = {}
+    end
+
+    def nastav(klic, &block)
+      @metody[klic] = block
+    end
+
+    def pro_tabulku(tabulka)
+      @tabulka = tabulka
+    end
+
+    def pro_objekt(objekt)
+      unless @objekt == objekt
+        @hodnoty = {}
+        @objekt = objekt
+      end
+      self
+    end
+
+    def [](klic)
+      h = @hodnoty[klic]
+      unless h
+        m = @metody[klic]
+        h = m ? m.call(@objekt) : nil
+        @hodnoty[klic] = h
+      end
+      h
+    end
+
+  end
+end

data/lib/xls_sestavy/tabulky/sloupce/sloupec.rb

@@ -6,7 +6,7 @@ module XLSSestavy
 
     # argumenty, fce, xls_format, datovy_typ, radek_souctu, sirka_sloupce
     def initialize(zahlavi, opts={}, &block)
-      @options = opts.merge! zahlavi: zahlavi, fce: (opts[:fce] || block)
+      @options = opts.merge! zahlavi: zahlavi, fce: (opts[:fce]||block), argumenty: (opts[:argumenty]||[])
     end
 
     def zahlavi
@@ -14,21 +14,23 @@ module XLSSestavy
       @zahlavi ||= I18n.translate(@options[:zahlavi], {default: @options[:zahlavi]}.merge!(@tabulka.sestava.params))
     end
 
-    def argumenty_array
-      return @argumenty_array if defined? @argumenty_array
+    def argumenty_array(objekt)
       raise 'Není přiřazena tabulka.' unless @tabulka
       params = @tabulka.sestava.params
-      @argumenty_array = (@options[:argumenty] || []).map{|arg_sym| params[arg_sym]}
+      if @tabulka.promenne
+        promenne = @tabulka.promenne.pro_objekt(objekt)
+        @options[:argumenty].map{|arg_sym| params[arg_sym] || promenne[arg_sym]}
+      else
+        @argumenty_array ||= @options[:argumenty].map{|arg_sym| params[arg_sym]}
+      end
     end
 
     def hodnota_pro(objekt)
       @fce ||= @options[:fce]
       if @fce.class==Proc
-        @fce.call(objekt, *argumenty_array)
+        @fce.call(objekt, *argumenty_array(objekt))
       elsif objekt.respond_to? @fce
-        objekt.send(@fce, *argumenty_array)
-      elsif nil
-        nil
+        objekt.send(@fce, *argumenty_array(objekt))
       else
         raise "Není definováno pro @fce=#{@fce.class}:#{@fce}"
       end

data/lib/xls_sestavy/tabulky/tabulka.rb

@@ -2,15 +2,19 @@
 module XLSSestavy
   class Tabulka
 
-    attr_reader :sestava
+    attr_reader :sestava, :promenne
 
     def initialize(sestava, args={}, &block)
       @sestava = sestava
       @args = args
 
       @sloupce = args[:sloupce] || []
+      @promenne = args[:promenne]
+
       yield self if block_given?
+
       @sloupce.each{|s| s.tabulka = self}
+      @promenne.pro_tabulku self if @promenne
     end
 
     def sloupec(*args, &block)
@@ -23,5 +27,10 @@ module XLSSestavy
       @sloupce << s
     end
 
+    def promenna(klic, &block)
+      @promenne ||= PromenneRadku.new
+      @promenne.nastav klic, &block
+    end
+
   end
 end

data/lib/xls_sestavy/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 module XLSSestavy
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: xls_sestavy
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ondřej Želazko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: writeexcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Uses writeexcel and puts some helper methods on top for making summaries
@@ -60,7 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -68,6 +68,7 @@ files:
 - lib/xls_sestavy.rb
 - lib/xls_sestavy/sestava.rb
 - lib/xls_sestavy/sestava_xls.rb
+- lib/xls_sestavy/tabulky/promenne_radku.rb
 - lib/xls_sestavy/tabulky/sloupce/definice_sloupcu.rb
 - lib/xls_sestavy/tabulky/sloupce/preddefinovany_sloupce.rb
 - lib/xls_sestavy/tabulky/sloupce/sloupec.rb
@@ -88,17 +89,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: xls simple helper library