billit_representers 0.8.12 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f555ee664313c79f311962dd8c8ad66ba6a8752
-  data.tar.gz: 0b374ddd9ee93d68d4c952cf1dc665994fea3ee7
+  metadata.gz: 9ad313075bd4af21d2a1f2c995ddeb608cd9f4a7
+  data.tar.gz: db586b4052f594a86cebd02826610cca4516f383
 SHA512:
-  metadata.gz: 281ed2b881fc44cf1d416008d064d6f72de0f292f7bf1d65abe0fb1b2957647bcfbdcc6bcb04df6eef1e5259f72f48561038df8d93a669a637e716d04e679cf3
-  data.tar.gz: b2fde6dc4710b24101ad1f3eee667f3a463301546152406f70e454c3a80788107652d5d6abe24f52fa80513cc7685092988f6bca799525ae22e4d69f0de3fd1a
+  metadata.gz: fb1f83f13ff34b77cbe761f5d6c7641c6475fb4946d545c2bcae290fa40e2ecc7a21d265fe3e5d9ea463ed0e41b0b3a1837541d615375bbac5b43c206af99b42
+  data.tar.gz: 0b2a40a2137e3c7e60386222b6601f7bf6f30f91e37be82465607a1945f04392e3bb327650452b63b0b912f1c541a625b0ba591abd801ecfef1f7a757f8acfaa

data/billit_representers.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |gem|
   gem.name        = 'billit_representers'
-  gem.version     = '0.8.12'
-  gem.date        = '2014-03-19'
+  gem.version     = '0.9.0'
+  gem.date        = '2014-03-21'
   gem.summary     = "Representers for the bill-it module of the Poplus project."
   gem.description = "Representers for the bill-it module of the Poplus project. These provide object-like access to remote data, using Resource-Oriented Architectures in Ruby (ROAR)."
   gem.authors     = ["Marcel Augsburger"]

data/lib/billit_representers/models/bill.rb

@@ -1,7 +1,7 @@
-require 'billit_representers/representers/bill_model_representer'
+require 'billit_representers/representers/bill_representer'
 module Billit
   class Bill
-    include Billit::BillModelRepresenter
+    include Billit::BillRepresenter
 
     attr_reader :representable_attrs
 

data/lib/billit_representers/models/bill_basic.rb

@@ -1,7 +1,7 @@
-require 'billit_representers/representers/bill_model_representer'
+require 'billit_representers/representers/bill_basic_representer'
 module Billit
   class BillBasic
-    include Billit::BillBasicModelRepresenter
+    include Billit::BillBasicRepresenter
 
     attr_reader :representable_attrs
 

data/lib/billit_representers/models/bill_page.rb

@@ -1,7 +1,7 @@
-require 'billit_representers/representers/bill_model_collection_page_representer'
+require 'billit_representers/representers/bill_page_representer'
 module Billit
-  class BillCollectionPage
-    include Billit::BillModelCollectionPageRepresenter
+  class BillPage
+    include Billit::BillPageRepresenter
 
     def self
 	  links[:self].href if links[:self]

data/lib/billit_representers/representers/{bill_basic_model_representer.rb → bill_basic_representer.rb}

@@ -7,14 +7,14 @@ require 'roar/representer/json/hal'
 require 'active_model'
 
 module Billit
-  module BillBasicModelRepresenter
+  module BillBasicRepresenter
     include Roar::Representer::JSON::HAL
     # include Roar::Rails::HAL
     # include Roar::Representer::JSON
 
     module Initializer
       def initialize
-        extend Billit::BillBasicModelRepresenter
+        extend Billit::BillBasicRepresenter
         extend Roar::Representer::Feature::Client
         super
       end

data/lib/billit_representers/representers/{bill_model_collection_page_representer.rb → bill_page_representer.rb}

@@ -1,16 +1,16 @@
 require 'roar/representer/json'
-require 'billit_representers/models/bill'
-require 'billit_representers/representers/bill_representer'
+require 'billit_representers/models/bill_basic'
+require 'billit_representers/representers/bill_basic_representer'
 
 module Billit
-  module BillModelCollectionPageRepresenter
+  module BillPageRepresenter
 
     include Roar::Representer::JSON
     include Roar::Representer::Feature::Hypermedia
 
     module Initializer
       def initialize
-        extend Billit::BillModelCollectionPageRepresenter
+        extend Billit::BillPageRepresenter
         extend Roar::Representer::Feature::Client
         super
       end
@@ -21,7 +21,7 @@ module Billit
       klass.send :include, Roar::Representer::Feature::HttpVerbs
     end
 
-    collection :bills, :extend => Billit::BillModelRepresenter, :class => Billit::Bill
+    collection :bills, :extend => Billit::BillBasicRepresenter, :class => Billit::BillBasic
 
     property :total_entries
     property :current_page

data/lib/billit_representers/representers/bill_representer.rb

@@ -1,7 +1,7 @@
 require 'roar/representer'
 require 'roar/representer/feature/http_verbs'
 require 'roar/representer/feature/client'
-# require 'roar/representer/json'
+require 'roar/representer/json'
 require 'roar/representer/json/hal'
 # require 'roar/rails/hal'
 require 'active_model'
@@ -12,6 +12,13 @@ require 'billit_representers/representers/document_representer'
 require 'billit_representers/representers/directive_representer'
 require 'billit_representers/representers/remark_representer'
 require 'billit_representers/representers/revision_representer'
+require 'billit_representers/models/paperwork'
+require 'billit_representers/models/priority'
+require 'billit_representers/models/report'
+require 'billit_representers/models/document'
+require 'billit_representers/models/directive'
+require 'billit_representers/models/remark'
+require 'billit_representers/models/revision'
 
 module Billit
   module BillRepresenter
@@ -57,13 +64,13 @@ module Billit
     property :abstract
     property :tags
 
-    collection :paperworks, extend: PaperworkRepresenter, class: Paperwork, parse_strategy: :sync
-    collection :priorities, extend: PriorityRepresenter, class: Priority, parse_strategy: :sync
-    collection :reports, extend: ReportRepresenter, class: Report, parse_strategy: :sync
-    collection :documents, extend: DocumentRepresenter, class: Document, parse_strategy: :sync
-    collection :directives, extend: DirectiveRepresenter, class: Directive, parse_strategy: :sync
-    collection :remarks, extend: RemarkRepresenter, class: Remark, parse_strategy: :sync
-    collection :revisions, extend: RevisionRepresenter, class: Revision, parse_strategy: :sync
+    collection :paperworks, extend: Billit::PaperworkRepresenter, class: Billit::Paperwork, parse_strategy: :sync
+    collection :priorities, extend: Billit::PriorityRepresenter, class: Billit::Priority, parse_strategy: :sync
+    collection :reports, extend: Billit::ReportRepresenter, class: Billit::Report, parse_strategy: :sync
+    collection :documents, extend: Billit::DocumentRepresenter, class: Billit::Document, parse_strategy: :sync
+    collection :directives, extend: Billit::DirectiveRepresenter, class: Billit::Directive, parse_strategy: :sync
+    collection :remarks, extend: Billit::RemarkRepresenter, class: Billit::Remark, parse_strategy: :sync
+    collection :revisions, extend: Billit::RevisionRepresenter, class: Billit::Revision, parse_strategy: :sync
 
     link :self do
       bill_url(self.uid)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billit_representers
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.9.0
 platform: ruby
 authors:
 - Marcel Augsburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roar
@@ -76,11 +76,8 @@ files:
 - lib/billit_representers/models/remark.rb
 - lib/billit_representers/models/report.rb
 - lib/billit_representers/models/revision.rb
-- lib/billit_representers/representers/bill_basic_model_representer.rb
-- lib/billit_representers/representers/bill_collection_page_representer.rb
-- lib/billit_representers/representers/bill_collection_representer.rb
-- lib/billit_representers/representers/bill_model_collection_page_representer.rb
-- lib/billit_representers/representers/bill_model_representer.rb
+- lib/billit_representers/representers/bill_basic_representer.rb
+- lib/billit_representers/representers/bill_page_representer.rb
 - lib/billit_representers/representers/bill_representer.rb
 - lib/billit_representers/representers/directive_representer.rb
 - lib/billit_representers/representers/document_representer.rb

data/lib/billit_representers/representers/bill_collection_page_representer.rb

@@ -1,33 +0,0 @@
-require 'roar/representer/json'
-require 'billit_representers/representers/bill_representer'
-
-module Billit
-  module BillCollectionPageRepresenter
-    include Roar::Representer::JSON
-    include Roar::Representer::Feature::Hypermedia
-   
-    collection :bills, :extend => BillRepresenter, :class => Bill
-
-    property :total_entries
-    property :current_page
-    property :total_pages
-   
-    link :self do |params|
-      url_for(params.merge(:page => current_page))
-    end
-   
-    link :next do |params|
-      url_for(params.merge(:page => next_page)) \
-        if next_page
-    end
-   
-    link :previous do |params|
-      url_for(params.merge(:page => previous_page)) \
-        if previous_page
-    end
-   
-    def bills
-      self
-    end
-  end
-end

data/lib/billit_representers/representers/bill_collection_representer.rb

@@ -1,16 +0,0 @@
-require 'roar/representer/json'
-require 'billit_representers/representers/bill_representer'
-
-
-module Billit
-  module BillCollectionRepresenter
-    include Roar::Representer::JSON
-    include Roar::Representer::Feature::Hypermedia
-
-    collection :bills, :extend => BillRepresenter, :class => Bill
-
-    def bills
-      collect
-    end
-  end
-end

data/lib/billit_representers/representers/bill_model_representer.rb

@@ -1,160 +0,0 @@
-require 'roar/representer'
-require 'roar/representer/feature/http_verbs'
-require 'roar/representer/feature/client'
-require 'roar/representer/json'
-require 'roar/representer/json/hal'
-# require 'roar/rails/hal'
-require 'active_model'
-require 'billit_representers/representers/paperwork_representer'
-require 'billit_representers/representers/priority_representer'
-require 'billit_representers/representers/report_representer'
-require 'billit_representers/representers/document_representer'
-require 'billit_representers/representers/directive_representer'
-require 'billit_representers/representers/remark_representer'
-require 'billit_representers/representers/revision_representer'
-require 'billit_representers/models/paperwork'
-require 'billit_representers/models/priority'
-require 'billit_representers/models/report'
-require 'billit_representers/models/document'
-require 'billit_representers/models/directive'
-require 'billit_representers/models/remark'
-require 'billit_representers/models/revision'
-
-module Billit
-  module BillModelRepresenter
-    include Roar::Representer::JSON::HAL
-    # include Roar::Rails::HAL
-    # include Roar::Representer::JSON
-
-    module Initializer
-      def initialize
-        extend Billit::BillModelRepresenter
-        extend Roar::Representer::Feature::Client
-        super
-      end
-    end
-
-    def self.included(klass)
-      klass.send :prepend, Initializer
-      klass.send :include, ActiveModel::Validations
-      klass.send :include, Roar::Representer::Feature::HttpVerbs
-      klass.validates_presence_of :uid
-      klass.validates :subject_areas, inclusion: { in: @@subject_areas_valid_values }
-      klass.validates :stage, inclusion: { in: @@stage_valid_values }
-      klass.validates :initial_chamber, inclusion: { in: @@initial_chamber_valid_values }
-      klass.validates :current_priority, inclusion: { in: @@current_priority_valid_values }
-    end
-
-    property :uid
-    property :short_uid, writeable: false
-    property :title
-    property :creation_date
-    property :source
-    property :initial_chamber
-    property :current_priority, writeable: false
-    property :stage
-    property :sub_stage
-    property :status
-    property :resulting_document
-    property :law_id, writeable: false
-    property :merged_bills
-    property :subject_areas
-    property :authors
-    property :publish_date
-    property :abstract
-    property :tags
-
-    collection :paperworks, extend: Billit::PaperworkRepresenter, class: Billit::Paperwork, parse_strategy: :sync
-    collection :priorities, extend: Billit::PriorityRepresenter, class: Billit::Priority, parse_strategy: :sync
-    collection :reports, extend: Billit::ReportRepresenter, class: Billit::Report, parse_strategy: :sync
-    collection :documents, extend: Billit::DocumentRepresenter, class: Billit::Document, parse_strategy: :sync
-    collection :directives, extend: Billit::DirectiveRepresenter, class: Billit::Directive, parse_strategy: :sync
-    collection :remarks, extend: Billit::RemarkRepresenter, class: Billit::Remark, parse_strategy: :sync
-    collection :revisions, extend: Billit::RevisionRepresenter, class: Billit::Revision, parse_strategy: :sync
-
-    link :self do
-      bill_url(self.uid)
-    end
-
-    link :law_xml do 
-        self.law_xml_link
-    end
-
-    link :law_web do 
-        self.law_web_link
-    end
-
-    link :bill_draft do 
-        self.bill_draft_link
-    end
-
-    @@subject_areas_valid_values =
-      [
-        'Defensa',
-        'Impuestos',
-        'Economía',
-        'Empresas',
-        'Hacienda',
-        'Relaciones Exteriores',
-        'Administración',
-        'Asunto Indígena',
-        'Zona Extrema',
-        'Regionalización',
-        'Salud',
-        'Minería',
-        'Medio Ambiente',
-        'Derechos Animales',
-        'Vivienda',
-        'Obras Públicas',
-        'Transporte',
-        'Telecomunicaciones',
-        'Trabajo',
-        'Protección Social',
-        'Cultura',
-        'Educación',
-        'Deportes',
-        'Transparencia',
-        'Probidad',
-        'Elecciones',
-        'Participación',
-        'Familia',
-        'Seguridad',
-        'Derechos Fundamentales',
-        'Nacionalidad',
-        'Reconstrucción Terremoto'
-      ]
-
-    @@stage_valid_values =
-      [
-        'Archivado',
-        'Comisión Mixta Ley de Presupuesto',
-        'Comisión Mixta por rechazo de idea de legislar',
-        'Comisión Mixta por rechazo de modificaciones',
-        'Disc. informe C.Mixta por rechazo de modific. en C...',
-        'Discusión veto en Cámara de Origen',
-        'Discusión veto en Cámara Revisora',
-        'Insistencia',
-        'Primer trámite constitucional',
-        'Retirado',
-        'Segundo trámite constitucional',
-        'Tercer trámite constitucional',
-        'Tramitación terminada',
-        'Trámite de aprobacion presidencial',
-        'Trámite finalización en Cámara de Origen'
-      ]
-
-    @@initial_chamber_valid_values =
-      [
-        'C.Diputados',
-        'Senado'
-      ]
-
-    @@current_priority_valid_values =
-      [
-        'Discusión inmediata',
-        'Simple',
-        'Sin urgencia',
-        'Suma'
-      ]
-  end
-end