wcc-contentful 0.3.0 → 0.4.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ec3b6e59e9d2f5a5e4ce7c7c3198b5bd2c26fd7
-  data.tar.gz: 6dcc462e7d3d993d7a7dd0717e560b5c63a59c40
+  metadata.gz: c54cd88861b87469555e71fe1a83ee70cbfe6dfe
+  data.tar.gz: e0fbecf29c3dde28acf284ecce0973a0ceca9669
 SHA512:
-  metadata.gz: cb4c3982f588c90189a82dbe9b7b11080d1981cd6ce89ade2b9169c0a463e5bb6f2e7e20500fc921548d77af77a7d85f43edd0ff913a0788afd1c388c6c7d7fc
-  data.tar.gz: 420d4070c5f4e977f68cfc0d61d431b114d0324d90764f042f0035e8e071fe563a5ddb0bcbca69929364f9c6f67b18e02c77c16a7db83859d69a7f2546b7e8f7
+  metadata.gz: 21d1522d8f7655123eebba0f2a768c279fdb8907f8333445255113dbf78b45ec64479f92c15053622bda2e222724be7ce903d350c5f677bbd94d9ee2bb2e753d
+  data.tar.gz: a84363867c283dea04e32120b71cbb0fe5fa15d58f4e2da242f28144ee59976740b5f78f9e52988ee15738aa9242113bf0fc4d9ae22ae9f73debd2721258ccd9

data/.rspec

@@ -1,4 +1,4 @@
+--require spec_helper
 --format documentation
 --color
---require spec_helper
 --order rand

data/Gemfile

@@ -2,7 +2,5 @@
 
 source 'https://rubygems.org'
 
-git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
-
 # Specify your gem's dependencies in wcc-contentful.gemspec
 gemspec

data/README.md

@@ -1,5 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/wcc-contentful.svg)](https://badge.fury.io/rb/wcc-contentful)
 [![CircleCI](https://circleci.com/gh/watermarkchurch/wcc-contentful.svg?style=svg)](https://circleci.com/gh/watermarkchurch/wcc-contentful)
+[![Coverage Status](https://coveralls.io/repos/github/watermarkchurch/wcc-contentful/badge.svg?branch=master)](https://coveralls.io/github/watermarkchurch/wcc-contentful?branch=master)
 
 Full documentation: https://www.rubydoc.info/github/watermarkchurch/wcc-contentful
 

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "wcc/contentful"
+require 'bundler/setup'
+require 'wcc/contentful'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "wcc/contentful"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/bin/rails

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 

data/lib/wcc/contentful.rb

@@ -12,7 +12,6 @@ require 'wcc/contentful/services'
 require 'wcc/contentful/simple_client'
 require 'wcc/contentful/store'
 require 'wcc/contentful/content_type_indexer'
-require 'wcc/contentful/model_validators'
 require 'wcc/contentful/model'
 require 'wcc/contentful/model_methods'
 require 'wcc/contentful/model_singleton_methods'
@@ -26,6 +25,8 @@ module WCC::Contentful
   class << self
     # Gets the current configuration, after calling WCC::Contentful.configure
     attr_reader :configuration
+
+    attr_reader :types
   end
 
   # Configures the WCC::Contentful gem to talk to a Contentful space.
@@ -52,8 +53,6 @@ module WCC::Contentful
   def self.init!
     raise ArgumentError, 'Please first call WCC:Contentful.configure' if configuration.nil?
 
-    @mutex ||= Mutex.new
-
     # we want as much as possible the raw JSON from the API so use the management
     # client if possible
     client = Services.instance.management_client ||
@@ -75,35 +74,6 @@ module WCC::Contentful
 
     WCC::Contentful::ModelBuilder.new(@types).build_models
 
-    # Extend all model types w/ validation & extra fields
-    @types.each_value do |t|
-      file = File.dirname(__FILE__) + "/contentful/model/#{t.name.underscore}.rb"
-      require file if File.exist?(file)
-    end
-
     require_relative 'contentful/client_ext' if defined?(::Contentful)
   end
-
-  # Runs validations over the content types returned from the Contentful API.
-  # Validations are configured on predefined model classes using the
-  # `validate_field` directive.  Example:
-  #    validate_field :top_button, :Link, :optional, link_to: 'menuButton'
-  # This results in a WCC::Contentful::ValidationError
-  # if the 'topButton' field in the 'menu' content type is not a link.
-  def self.validate_models!
-    # Ensure application models are loaded before we validate
-    Dir[Rails.root.join('app/models/**/*.rb')].each { |file| require file } if defined?(Rails)
-
-    content_types = WCC::Contentful::ModelValidators.transform_content_types_for_validation(
-      @content_types
-    )
-    errors = WCC::Contentful::Model.schema.call(content_types)
-    raise WCC::Contentful::ValidationError, errors.errors unless errors.success?
-  end
-
-  # TODO: https://zube.io/watermarkchurch/development/c/2234 init graphql
-  # def self.init_graphql!
-  #   require 'wcc/contentful/graphql'
-  #   etc...
-  # end
 end

data/lib/wcc/contentful/exceptions.rb

@@ -1,39 +1,6 @@
 # frozen_string_literal: true
 
 module WCC::Contentful
-  # Raised by {WCC::Contentful.validate_models!} if a content type in the space
-  # does not match the validation defined on the associated model.
-  class ValidationError < StandardError
-    Message =
-      Struct.new(:path, :error) do
-        def to_s
-          "#{path}: #{error}"
-        end
-      end
-
-    attr_reader :errors
-
-    def initialize(errors)
-      @errors = ValidationError.join_msg_keys(errors)
-      super("Content Type Schema from Contentful failed validation!\n  #{@errors.join("\n  ")}")
-    end
-
-    # Turns the error messages hash into an array of message structs like:
-    # menu.fields.name.type: must be equal to String
-    def self.join_msg_keys(hash)
-      ret =
-        hash.map do |k, v|
-          if v.is_a?(Hash)
-            msgs = join_msg_keys(v)
-            msgs.map { |msg| Message.new(k.to_s + '.' + msg.path, msg.error) }
-          else
-            v.map { |msg| Message.new(k.to_s, msg) }
-          end
-        end
-      ret.flatten(1)
-    end
-  end
-
   class SyncError < StandardError
   end
 

data/lib/wcc/contentful/model.rb

@@ -38,7 +38,6 @@
 # @api Model
 class WCC::Contentful::Model
   extend WCC::Contentful::Helpers
-  extend WCC::Contentful::ModelValidators
 
   # The Model base class maintains a registry which is best expressed as a
   # class var.

data/lib/wcc/contentful/store/postgres_store.rb

@@ -109,7 +109,7 @@ module WCC::Contentful::Store
           resolve_includes(
             JSON.parse(row['data']),
             @options[:include]
-            )
+          )
           )
         end
         arr
@@ -122,7 +122,7 @@ module WCC::Contentful::Store
             resolve_includes(
               JSON.parse(row['data']),
               @options[:include]
-             )
+            )
         end
         arr
       end

data/lib/wcc/contentful/version.rb

@@ -2,6 +2,6 @@
 
 module WCC
   module Contentful
-    VERSION = '0.3.0'
+    VERSION = '0.4.0-alpha'
   end
 end

data/wcc-contentful.gemspec

@@ -10,9 +10,9 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Watermark Dev']
   spec.email         = ['dev@watermark.org']
 
-  spec.summary       = File.readlines('README.md').join
-  spec.description   = 'Contentful API wrapper library for Watermark apps'
-  spec.homepage      = 'https://github.com/watermarkchurch/wcc-contentful'
+  spec.summary       = File.readlines(File.expand_path('README.md', __dir__)).join
+  spec.description   = 'Contentful API wrapper library exposing an ActiveRecord-like interface'
+  spec.homepage      = 'https://github.com/watermarkchurch/wcc-contentful/wcc-contentful'
   spec.license       = 'MIT'
 
   spec.required_ruby_version = '>= 2.3'
@@ -24,12 +24,14 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ['lib']
 
+  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'dotenv', '~> 2.2'
   spec.add_development_dependency 'httplog', '~> 1.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.3.0'
   spec.add_development_dependency 'rubocop', '~> 0.52'
+  spec.add_development_dependency 'simplecov', '~> 0.16.1'
   spec.add_development_dependency 'vcr', '~> 4.0'
   spec.add_development_dependency 'webmock', '~> 3.0'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0.pre.alpha
 platform: ruby
 authors:
 - Watermark Dev
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.52'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -366,26 +394,17 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
-description: Contentful API wrapper library for Watermark apps
+description: Contentful API wrapper library exposing an ActiveRecord-like interface
 email:
 - dev@watermark.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
-- CHANGELOG.md
-- CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
-- LICENSE.txt
 - README.md
-- Rakefile
 - app/controllers/wcc/contentful/application_controller.rb
 - app/controllers/wcc/contentful/webhook_controller.rb
 - app/jobs/wcc/contentful/delayed_sync_job.rb
@@ -396,18 +415,6 @@ files:
 - bin/setup
 - config/initializers/mime_types.rb
 - config/routes.rb
-- lib/generators/wcc/USAGE
-- lib/generators/wcc/model_generator.rb
-- lib/generators/wcc/templates/.keep
-- lib/generators/wcc/templates/Procfile
-- lib/generators/wcc/templates/contentful_shell_wrapper
-- lib/generators/wcc/templates/menu/generated_add_menus.ts
-- lib/generators/wcc/templates/menu/models/menu.rb
-- lib/generators/wcc/templates/menu/models/menu_button.rb
-- lib/generators/wcc/templates/page/generated_add_pages.ts
-- lib/generators/wcc/templates/page/models/page.rb
-- lib/generators/wcc/templates/release
-- lib/generators/wcc/templates/wcc_contentful.rb
 - lib/wcc/contentful.rb
 - lib/wcc/contentful/client_ext.rb
 - lib/wcc/contentful/configuration.rb
@@ -420,16 +427,9 @@ files:
 - lib/wcc/contentful/helpers.rb
 - lib/wcc/contentful/indexed_representation.rb
 - lib/wcc/contentful/model.rb
-- lib/wcc/contentful/model/dropdown_menu.rb
-- lib/wcc/contentful/model/menu.rb
-- lib/wcc/contentful/model/menu_button.rb
-- lib/wcc/contentful/model/page.rb
-- lib/wcc/contentful/model/redirect.rb
 - lib/wcc/contentful/model_builder.rb
 - lib/wcc/contentful/model_methods.rb
 - lib/wcc/contentful/model_singleton_methods.rb
-- lib/wcc/contentful/model_validators.rb
-- lib/wcc/contentful/model_validators/dsl.rb
 - lib/wcc/contentful/rails.rb
 - lib/wcc/contentful/services.rb
 - lib/wcc/contentful/simple_client.rb
@@ -446,7 +446,7 @@ files:
 - lib/wcc/contentful/sys.rb
 - lib/wcc/contentful/version.rb
 - wcc-contentful.gemspec
-homepage: https://github.com/watermarkchurch/wcc-contentful
+homepage: https://github.com/watermarkchurch/wcc-contentful/wcc-contentful
 licenses:
 - MIT
 metadata: {}
@@ -461,16 +461,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: '[![Gem Version](https://badge.fury.io/rb/wcc-contentful.svg)](https://badge.fury.io/rb/wcc-contentful)
-  [![CircleCI](https://circleci.com/gh/watermarkchurch/wcc-contentful.svg?style=svg)](https://circleci.com/gh/watermarkchurch/wcc-contentful)  Full
+  [![CircleCI](https://circleci.com/gh/watermarkchurch/wcc-contentful.svg?style=svg)](https://circleci.com/gh/watermarkchurch/wcc-contentful)
+  [![Coverage Status](https://coveralls.io/repos/github/watermarkchurch/wcc-contentful/badge.svg?branch=master)](https://coveralls.io/github/watermarkchurch/wcc-contentful?branch=master)  Full
   documentation: https://www.rubydoc.info/github/watermarkchurch/wcc-contentful  #
   WCC::Contentful  ## Installation  Add this line to your application''s Gemfile:  ```ruby
   gem ''wcc-contentful'', require: ''wcc/contentful/rails'' ```  And then execute:  $

data/.circleci/config.yml

@@ -1,51 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: circleci/ruby:2.3.3-node
-        environment:
-          RAILS_ENV: test
-          POSTGRES_CONNECTION: postgresql://ubuntu:@127.0.0.1:5432/circle_ruby_test
-      - image: postgres:10
-        environment:
-        - POSTGRES_USER: ubuntu
-        - POSTGRES_DB: circle_ruby_test
-    steps:
-      - checkout
-      # Restore bundle cache
-      - restore_cache:
-          key: rails-{{ checksum "wcc-contentful.gemspec" }}
-
-      # Bundle install dependencies
-      - run: bundle install --path /tmp/vendor/bundle
-
-      # Store bundle cache
-      - save_cache:
-          key: rails-{{ checksum "wcc-contentful.gemspec" }}
-          paths:
-            - /tmp/vendor/bundle
-
-      # run Danger
-      # - type: shell
-      #   command: |
-      #     bundle exec danger
-
-      # run rubocop
-      - type: shell
-        command: |
-          bundle exec rubocop
-
-      # Run rspec in parallel
-      - type: shell
-        command: |
-          bundle exec rspec --profile 10 \
-                            --format RspecJunitFormatter \
-                            --out test_results/rspec.xml \
-                            --format documentation \
-                            --order rand \
-                            $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-
-      # Save test results for timing analysis
-      - store_test_results:
-          path: test_results
-

data/.gitignore

@@ -1,26 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
-
-Gemfile.lock
-
-# exports and error logs from contentful
-contentful-export*
-contentful-*-error-log-*
-
-# User local env
-.envrc
-.env*
-
-node_modules
-
-log/
-tmp/